More proper ci workflows.

2023-03-14 23:17:50 -04:00 · 2023-03-14 23:17:50 -04:00 · 5bde134955
parent 5ad9f86514
commit 5bde134955
5 changed files with 66 additions and 59 deletions
--- a/.ci/setup_windows_zip.ps1
+++ b/.ci/setup_windows_zip.ps1
@ -1,25 +0,0 @@
-Invoke-WebRequest -URI https://www.python.org/ftp/python/3.10.9/python-3.10.9-embed-amd64.zip -O python_embeded.zip
-Expand-Archive python_embeded.zip
-cd python_embeded
-Add-Content -Path .\python310._pth -Value 'import site'
-Invoke-WebRequest -Uri https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py
-.\python.exe get-pip.py
-.\python.exe -s -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 xformers -r ../ComfyUI/requirements.txt pygit2
-"../ComfyUI`n" + (Get-Content .\python310._pth -Raw) | Set-Content .\python310._pth
-cd ..
-
-
-mkdir ComfyUI_windows_portable
-mv python_embeded ComfyUI_windows_portable
-mv ComfyUI_copy ComfyUI_windows_portable/ComfyUI
-
-cd ComfyUI_windows_portable
-
-mkdir update
-cp -r ComfyUI/.ci/update_windows/* ./update/
-cp -r ComfyUI/.ci/windows_base_files/* ./
-
-cd ..
-
-& "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on ComfyUI_windows_portable.7z ComfyUI_windows_portable
-mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_nvidia_or_cpu.7z
--- a/.ci/setup_windows_zip_nightly_pytorch.ps1
+++ b/.ci/setup_windows_zip_nightly_pytorch.ps1
@ -1,27 +0,0 @@
-Invoke-WebRequest -URI https://www.python.org/ftp/python/3.10.9/python-3.10.9-embed-amd64.zip -O python_embeded.zip
-Expand-Archive python_embeded.zip
-rm python_embeded.zip
-cd python_embeded
-Add-Content -Path .\python310._pth -Value 'import site'
-Invoke-WebRequest -Uri https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py
-.\python.exe get-pip.py
-python -m pip wheel torch torchvision torchaudio --pre --extra-index-url https://download.pytorch.org/whl/nightly/cu118 -r ../ComfyUI/requirements.txt pygit2 -w ../temp_wheel_dir
-ls ../temp_wheel_dir
-.\python.exe -s -m pip install --pre (get-item ..\temp_wheel_dir\*)
-"../ComfyUI`n" + (Get-Content .\python310._pth -Raw) | Set-Content .\python310._pth
-cd ..
-
-mkdir ComfyUI_windows_portable_nightly_pytorch
-mv python_embeded ComfyUI_windows_portable_nightly_pytorch
-mv ComfyUI_copy ComfyUI_windows_portable_nightly_pytorch/ComfyUI
-
-cd ComfyUI_windows_portable_nightly_pytorch
-
-mkdir update
-cp -r ComfyUI/.ci/nightly/update_windows/* ./update/
-cp -r ComfyUI/.ci/nightly/windows_base_files/* ./
-
-cd ..
-
-& "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI_windows_portable_nightly_pytorch
-mv ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI/ComfyUI_windows_portable_nvidia_or_cpu_nightly_pytorch.7z
--- a/.github/workflows/windows_release.yml
+++ b/.github/workflows/windows_release.yml
@ -18,13 +18,42 @@ jobs:
          with:
            fetch-depth: 0

-        - run: |
+        - shell: bash
+          run: |
            cd ..
-            cp ComfyUI/.ci/setup_windows_zip.ps1 ./
            cp -r ComfyUI ComfyUI_copy
-            .\setup_windows_zip.ps1
+            wget https://www.python.org/ftp/python/3.10.9/python-3.10.9-embed-amd64.zip -O python_embeded.zip
+            unzip python_embeded.zip -d python_embeded
+            cd python_embeded
+            echo 'import site' >> ./python310._pth
+            wget https://bootstrap.pypa.io/get-pip.py -O get-pip.py
+            ./python.exe get-pip.py
+            ./python.exe -s -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 xformers -r ../ComfyUI/requirements.txt pygit2
+            sed -i '1i../ComfyUI' ./python310._pth
+            cd ..
+
+
+            mkdir ComfyUI_windows_portable
+            mv python_embeded ComfyUI_windows_portable
+            mv ComfyUI_copy ComfyUI_windows_portable/ComfyUI
+
+            cd ComfyUI_windows_portable
+
+            mkdir update
+            cp -r ComfyUI/.ci/update_windows/* ./update/
+            cp -r ComfyUI/.ci/windows_base_files/* ./
+
+            cd ..
+
+            "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on ComfyUI_windows_portable.7z ComfyUI_windows_portable
+            mv ComfyUI_windows_portable.7z ComfyUI/ComfyUI_windows_portable_nvidia_or_cpu.7z
+
+            cd ComfyUI_windows_portable
+            python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu
+
            ls

+
        - name: Upload binaries to release
          uses: svenstaro/upload-release-action@v2
          with:
--- a/.github/workflows/windows_release_cu118.yml
+++ b/.github/workflows/windows_release_cu118.yml
@ -23,7 +23,7 @@ jobs:
            cd ..
            cp -r ComfyUI ComfyUI_copy
            wget https://www.python.org/ftp/python/3.10.9/python-3.10.9-embed-amd64.zip -O python_embeded.zip
-            unzip python_embeded.zip
+            unzip python_embeded.zip -d python_embeded
            cd python_embeded
            echo 'import site' >> ./python310._pth
            wget https://bootstrap.pypa.io/get-pip.py -O get-pip.py
--- a/.github/workflows/windows_release_nightly_pytorch.yml
+++ b/.github/workflows/windows_release_nightly_pytorch.yml
@ -20,11 +20,41 @@ jobs:
        - uses: actions/setup-python@v4
          with:
            python-version: '3.10.9'
-        - run: |
+        - shell: bash
+          run: |
            cd ..
-            cp ComfyUI/.ci/setup_windows_zip_nightly_pytorch.ps1 ./
            cp -r ComfyUI ComfyUI_copy
-            .\setup_windows_zip_nightly_pytorch.ps1
+            wget https://www.python.org/ftp/python/3.10.9/python-3.10.9-embed-amd64.zip -O python_embeded.zip
+            unzip python_embeded.zip -d python_embeded
+            cd python_embeded
+            echo 'import site' >> ./python310._pth
+            wget https://bootstrap.pypa.io/get-pip.py -O get-pip.py
+            ./python.exe get-pip.py
+            python -m pip wheel torch torchvision torchaudio --pre --extra-index-url https://download.pytorch.org/whl/nightly/cu118 -r ../ComfyUI/requirements.txt pygit2 -w ../temp_wheel_dir
+            ls ../temp_wheel_dir
+            ./python.exe -s -m pip install --pre ../temp_wheel_dir/*
+            sed -i '1i../ComfyUI' ./python310._pth
+            cd ..
+
+
+            mkdir ComfyUI_windows_portable_nightly_pytorch
+            mv python_embeded ComfyUI_windows_portable_nightly_pytorch
+            mv ComfyUI_copy ComfyUI_windows_portable_nightly_pytorch/ComfyUI
+
+            cd ComfyUI_windows_portable_nightly_pytorch
+
+            mkdir update
+            cp -r ComfyUI/.ci/update_windows/* ./update/
+            cp -r ComfyUI/.ci/windows_base_files/* ./
+
+            cd ..
+
+            "C:\Program Files\7-Zip\7z.exe" a -t7z -m0=lzma -mx=8 -mfb=64 -md=32m -ms=on ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI_windows_portable_nightly_pytorch
+            mv ComfyUI_windows_portable_nightly_pytorch.7z ComfyUI/ComfyUI_windows_portable_nvidia_or_cpu_nightly_pytorch.7z
+
+            cd ComfyUI_windows_portable_nightly_pytorch
+            python_embeded/python.exe -s ComfyUI/main.py --quick-test-for-ci --cpu
+
            ls

        - name: Upload binaries to release