diff --git a/.github/actions/build/windows/app/action.yml b/.github/actions/build/windows/app/action.yml index c75fa0d9..0dd9ca33 100644 --- a/.github/actions/build/windows/app/action.yml +++ b/.github/actions/build/windows/app/action.yml @@ -12,6 +12,11 @@ inputs: default: false required: false type: boolean + build-targets: + description: Override the default targets and build the passed targets. Comma separated list. Include '--target' and full names, eg '--targets=@electron-forge/maker-squirrel, ...etc' + required: false + default: '' + type: string runs: using: composite steps: @@ -27,7 +32,7 @@ runs: 7z x comfyui-win.7z -odist/ move dist/ComfyUI_windows_portable/ComfyUI assets/UI/ move dist/ComfyUI_windows_portable/python_embedded assets/UI/ - cd assets/UI/ComfyUI && ls + for /D /R %%i in (*pycache*) do rmdir /s /q "%%~i shell: cmd - name: Make app shell: powershell @@ -36,7 +41,7 @@ runs: DEBUG: electron-forge:* PUBLISH: ${{ inputs.sign-and-publish }} GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }} - run: npm run ${{inputs.sign-and-publish == true && 'publish' || 'make'}} + run: npm run ${{inputs.sign-and-publish == true && 'publish' || 'make'}} -- ${{inputs.build-targets}} - name: Print SignLogs if: ${{inputs.sign-and-publish == true && always()}} continue-on-error: true diff --git a/.github/workflows/debug_windows.yml b/.github/workflows/debug_windows.yml index 2c7249f4..589092f6 100644 --- a/.github/workflows/debug_windows.yml +++ b/.github/workflows/debug_windows.yml @@ -1,4 +1,4 @@ -name: Build Windows Debug +name: Build App Windows Debug on: workflow_dispatch: @@ -17,10 +17,11 @@ jobs: - name: Build uses: ./.github/actions/build/windows/app with: + build-targets: '--targets=@electron-forge/maker-zip' sign-and-publish: false GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Upload Build uses: actions/upload-artifact@v4 with: - name: comfyui-electron-debug-build-${{env.sha_short}} + name: comfyui-electron-win32-debug-build-${{env.sha_short}} path: out/make/zip/win32/x64/*.zip \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 6425b219..7f28f129 100644 --- a/src/main.ts +++ b/src/main.ts @@ -98,7 +98,7 @@ const launchPythonServer = async () => { checkServerReady(); }); -s + }; // This method will be called when Electron has finished