diff --git a/.github/workflows/test-ci.yml b/.github/workflows/test-ci.yml index 1660ec8e3..adfc5dd32 100644 --- a/.github/workflows/test-ci.yml +++ b/.github/workflows/test-ci.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - release/** paths-ignore: - 'app/**' - 'input/**' diff --git a/.github/workflows/test-execution.yml b/.github/workflows/test-execution.yml index 00ef07ebf..5780ca15c 100644 --- a/.github/workflows/test-execution.yml +++ b/.github/workflows/test-execution.yml @@ -2,9 +2,9 @@ name: Execution Tests on: push: - branches: [ main, master ] + branches: [ master, release/** ] pull_request: - branches: [ main, master ] + branches: [ master, release/** ] jobs: test: diff --git a/.github/workflows/test-launch.yml b/.github/workflows/test-launch.yml index 1735fd83b..7ad55c837 100644 --- a/.github/workflows/test-launch.yml +++ b/.github/workflows/test-launch.yml @@ -2,9 +2,9 @@ name: Test server launches without errors on: push: - branches: [ main, master ] + branches: [ master, release/** ] pull_request: - branches: [ main, master ] + branches: [ master, release/** ] jobs: test: diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 00caf5b8a..b337201c4 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -2,9 +2,9 @@ name: Unit Tests on: push: - branches: [ main, master ] + branches: [ master, release/** ] pull_request: - branches: [ main, master ] + branches: [ master, release/** ] jobs: test: diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index d9d488974..c2343cc39 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -6,6 +6,7 @@ on: - "pyproject.toml" branches: - master + - release/** jobs: update-version: diff --git a/.github/workflows/windows_release_nightly_pytorch.yml b/.github/workflows/windows_release_nightly_pytorch.yml index ca1ef71ae..d5bee48a5 100644 --- a/.github/workflows/windows_release_nightly_pytorch.yml +++ b/.github/workflows/windows_release_nightly_pytorch.yml @@ -9,6 +9,12 @@ on: type: string default: "129" + release_tag: + description: 'Git tag to attach nightly package (e.g., v0.37.0); leave empty to upload to latest' + required: false + type: string + default: "" + python_minor: description: 'python minor version' required: true @@ -34,6 +40,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + ref: ${{ inputs.release_tag || 'master' }} fetch-depth: 30 persist-credentials: false - uses: actions/setup-python@v5 @@ -89,5 +96,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ComfyUI_windows_portable_nvidia_or_cpu_nightly_pytorch.7z - tag: "latest" + tag: ${{ inputs.release_tag || 'latest' }} overwrite: true diff --git a/.github/workflows/windows_release_package.yml b/.github/workflows/windows_release_package.yml index 7955325fc..4b21fa48d 100644 --- a/.github/workflows/windows_release_package.yml +++ b/.github/workflows/windows_release_package.yml @@ -9,6 +9,12 @@ on: type: string default: "129" + release_tag: + description: 'Git tag to package and attach (e.g., v0.37.0); leave empty to build from master and upload to latest' + required: false + type: string + default: "" + python_minor: description: 'python minor version' required: true @@ -50,6 +56,7 @@ jobs: - uses: actions/checkout@v4 with: + ref: ${{ inputs.release_tag || 'master' }} fetch-depth: 150 persist-credentials: false - shell: bash @@ -101,6 +108,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: new_ComfyUI_windows_portable_nvidia_cu${{ inputs.cu }}_or_cpu.7z - tag: "latest" + tag: ${{ inputs.release_tag || 'latest' }} overwrite: true -