298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-01-11 02:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 29142227e3 into ff838657fa

Browse Source
This commit is contained in:
Victor 2025-01-09 20:28:42 +08:00 committed by GitHub
commit a0c2aed3e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.ci/update_windows/update.py
View File

@ -5,10 +5,10 @@ import os
import shutil import shutil
import filecmp import filecmp
def pull(repo, remote_name='origin', branch='master'): def pull(repo, remote_name='origin', branch='master', proxy=None):
for remote in repo.remotes: for remote in repo.remotes:
if remote.name == remote_name: if remote.name == remote_name:
remote.fetch() remote.fetch(proxy=proxy)
remote_master_id = repo.lookup_reference('refs/remotes/origin/%s' % (branch)).target remote_master_id = repo.lookup_reference('refs/remotes/origin/%s' % (branch)).target
merge_result, _ = repo.merge_analysis(remote_master_id) merge_result, _ = repo.merge_analysis(remote_master_id)
# Up to date, do nothing # Up to date, do nothing
@ -46,6 +46,14 @@ def pull(repo, remote_name='origin', branch='master'):
pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0) pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)
repo_path = str(sys.argv[1]) repo_path = str(sys.argv[1])
proxy = None
if '--proxy' in sys.argv:
proxy_index = sys.argv.index('--proxy')
if proxy_index + 1 < len(sys.argv):
proxy = sys.argv[proxy_index + 1]
if len(proxy)<=0:
proxy = None
repo = pygit2.Repository(repo_path) repo = pygit2.Repository(repo_path)
ident = pygit2.Signature('comfyui', 'comfy@ui') ident = pygit2.Signature('comfyui', 'comfy@ui')
try: try:
@ -73,7 +81,7 @@ else:
repo.checkout(ref) repo.checkout(ref)
print("pulling latest changes") # noqa: T201 print("pulling latest changes") # noqa: T201
pull(repo) pull(repo, proxy=proxy)
if "--stable" in sys.argv: if "--stable" in sys.argv:
def latest_tag(repo): def latest_tag(repo):

6
.ci/update_windows/update_comfyui.bat
View File

@ -1,8 +1,10 @@
@echo off @echo off
..\python_embeded\python.exe .\update.py ..\ComfyUI\ :: Set the http proxy here like `set proxy="http://127.0.0.1:888/"`. No spacebar allowed.
set proxy=""
..\python_embeded\python.exe .\update.py ..\ComfyUI\ --proxy %proxy%
if exist update_new.py ( if exist update_new.py (
move /y update_new.py update.py move /y update_new.py update.py
echo Running updater again since it got updated. echo Running updater again since it got updated.
..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --proxy %proxy%
) )
if "%~1"=="" pause if "%~1"=="" pause

6
.ci/update_windows/update_comfyui_stable.bat
View File

@ -1,8 +1,10 @@
@echo off @echo off
..\python_embeded\python.exe .\update.py ..\ComfyUI\ --stable :: Set the http proxy here like `set proxy="http://127.0.0.1:888/"`. No spacebar allowed.
set proxy=""
..\python_embeded\python.exe .\update.py ..\ComfyUI\ --proxy %proxy% --stable
if exist update_new.py ( if exist update_new.py (
move /y update_new.py update.py move /y update_new.py update.py
echo Running updater again since it got updated. echo Running updater again since it got updated.
..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --stable ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --proxy %proxy% --stable
) )
if "%~1"=="" pause if "%~1"=="" pause