Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

Fix the nightly build not being packaged correctly.

comfyanonymouse543ecad6991
diff --git a/.ci/nightly/update_windows/update.py b/.ci/nightly/update_windows/update.py
deleted file mode 100755
index c09f29a80..000000000
--- a/.ci/nightly/update_windows/update.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import pygit2
-from datetime import datetime
-import sys
-
-def pull(repo, remote_name='origin', branch='master'):
- for remote in repo.remotes:
- if remote.name == remote_name:
- remote.fetch()
- remote_master_id = repo.lookup_reference('refs/remotes/origin/%s' % (branch)).target
- merge_result, _ = repo.merge_analysis(remote_master_id)
- # Up to date, do nothing
- if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE:
- return
- # We can just fastforward
- elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
- repo.checkout_tree(repo.get(remote_master_id))
- try:
- master_ref = repo.lookup_reference('refs/heads/%s' % (branch))
- master_ref.set_target(remote_master_id)
- except KeyError:
- repo.create_branch(branch, repo.get(remote_master_id))
- repo.head.set_target(remote_master_id)
- elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
- repo.merge(remote_master_id)
-
- if repo.index.conflicts is not None:
- for conflict in repo.index.conflicts:
- print('Conflicts found in:', conflict[0].path)
- raise AssertionError('Conflicts, ahhhhh!!')
-
- user = repo.default_signature
- tree = repo.index.write_tree()
- commit = repo.create_commit('HEAD',
- user,
- user,
- 'Merge!',
- tree,
- [repo.head.target, remote_master_id])
- # We need to do this or git CLI will think we are still merging.
- repo.state_cleanup()
- else:
- raise AssertionError('Unknown merge analysis result')
-
-
-repo = pygit2.Repository(str(sys.argv[1]))
-ident = pygit2.Signature('comfyui', 'comfy@ui')
-try:
- print("stashing current changes")
- repo.stash(ident)
-except KeyError:
- print("nothing to stash")
-backup_branch_name = 'backup_branch_{}'.format(datetime.today().strftime('%Y-%m-%d_%H_%M_%S'))
-print("creating backup branch: {}".format(backup_branch_name))
-repo.branches.local.create(backup_branch_name, repo.head.peel())
-
-print("checking out master branch")
-branch = repo.lookup_branch('master')
-ref = repo.lookup_reference(branch.name)
-repo.checkout(ref)
-
-print("pulling latest changes")
-pull(repo)
-
-print("Done!")
-
diff --git a/.ci/nightly/update_windows/update_comfyui.bat b/.ci/nightly/update_windows/update_comfyui.bat
deleted file mode 100755
index 60d1e694f..000000000
--- a/.ci/nightly/update_windows/update_comfyui.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-..\python_embeded\python.exe .\update.py ..\ComfyUI\
-pause
diff --git a/.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat b/.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat
index c5e0c6be7..c345a6992 100755
--- a/.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat
+++ b/.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat
@@ -1,3 +1,3 @@
..\python_embeded\python.exe .\update.py ..\ComfyUI\
-..\python_embeded\python.exe -s -m pip install --upgrade --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118 -r ../ComfyUI/requirements.txt pygit2
+..\python_embeded\python.exe -s -m pip install --upgrade --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121 -r ../ComfyUI/requirements.txt pygit2
pause
diff --git a/.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt b/.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt
deleted file mode 100755
index 656b9db43..000000000
--- a/.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-HOW TO RUN:
-
-if you have a NVIDIA gpu:
-
-run_nvidia_gpu.bat
-
-
-
-To run it in slow CPU mode:
-
-run_cpu.bat
-
-
-
-IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
-
-You can download the stable diffusion 1.5 one from: https://huggingface.co/runwayml/stable-diffusion-v1-5/blob/main/v1-5-pruned-emaonly.ckpt
-
-
-
-RECOMMENDED WAY TO UPDATE:
-To update the ComfyUI code: update\update_comfyui.bat
-
-
-
-To update ComfyUI with the python dependencies:
-update\update_comfyui_and_python_dependencies.bat
diff --git a/.ci/nightly/windows_base_files/run_cpu.bat b/.ci/nightly/windows_base_files/run_cpu.bat
deleted file mode 100755
index c3ba41721..000000000
--- a/.ci/nightly/windows_base_files/run_cpu.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-.\python_embeded\python.exe -s ComfyUI\main.py --cpu --windows-standalone-build
-pause
diff --git a/.github/workflows/windows_release_nightly_pytorch.yml b/.github/workflows/windows_release_nightly_pytorch.yml
index 32d2f320b..4d686ded8 100644
--- a/.github/workflows/windows_release_nightly_pytorch.yml
+++ b/.github/workflows/windows_release_nightly_pytorch.yml
@@ -46,6 +46,8 @@ jobs:
mkdir update
cp -r ComfyUI/.ci/update_windows/* ./update/
cp -r ComfyUI/.ci/windows_base_files/* ./
+ cp -r ComfyUI/.ci/nightly/update_windows/* ./update/
+ cp -r ComfyUI/.ci/nightly/windows_base_files/* ./
cd ..