From 1e5f207006316b9a25facf3464862a8e1e2fc31e Mon Sep 17 00:00:00 2001 From: leejet Date: Wed, 17 Sep 2025 22:11:55 +0800 Subject: [PATCH] chore: fix workflow (#836) --- .github/workflows/build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9c64dd..f6cf11e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -254,7 +254,7 @@ jobs: - name: Copy and pack Cuda runtime id: pack_cuda_runtime - if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.build == 'cuda12' ) || github.event.inputs.create_release == 'true' }} + if: ${{ matrix.build == 'cuda12' && (github.event_name == 'push' && github.ref == 'refs/heads/master' || github.event.inputs.create_release == 'true') }} run: | echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}" $dst='.\build\bin\cudart\' @@ -262,7 +262,7 @@ jobs: 7z a cudart-sd-bin-win-cu12-x64.zip $dst\* - name: Upload Cuda runtime - if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.build == 'cuda12' ) || github.event.inputs.create_release == 'true' }} + if: ${{ matrix.build == 'cuda12' && (github.event_name == 'push' && github.ref == 'refs/heads/master' || github.event.inputs.create_release == 'true') }} uses: actions/upload-artifact@v4 with: name: sd-cudart-sd-bin-win-cu12-x64.zip @@ -288,6 +288,11 @@ jobs: - windows-latest-cmake steps: + - name: Clone + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Download artifacts id: download-artifact uses: actions/download-artifact@v4 @@ -298,7 +303,8 @@ jobs: - name: Get commit count id: commit_count - run: echo "count=$(git rev-list --count HEAD)" >> $GITHUB_OUTPUT + run: | + echo "count=$(git rev-list --count HEAD)" >> $GITHUB_OUTPUT - name: Get commit hash id: commit @@ -306,17 +312,16 @@ jobs: - name: Create release id: create_release + if: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'master' }} uses: anzz1/action-create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: > - ${{ github.ref_name == 'master' && - format('release_{0}_{1}', steps.commit_count.outputs.count, steps.commit.outputs.short) || - format('{0}-{1}', env.BRANCH_NAME, steps.commit.outputs.short) }} + tag_name: ${{ format('{0}-{1}-{2}', env.BRANCH_NAME, steps.commit_count.outputs.count, steps.commit.outputs.short) }} - name: Upload release id: upload_release + if: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'master' }} uses: actions/github-script@v3 with: github-token: ${{secrets.GITHUB_TOKEN}}