diff --git a/.github/workflows/build_binary.yml b/.github/workflows/build_binary.yml index a8f96b7037..3804e99481 100644 --- a/.github/workflows/build_binary.yml +++ b/.github/workflows/build_binary.yml @@ -2,6 +2,8 @@ name: Binary Release Build on: push: + branches: + - release/** env: CARGO_TERM_COLOR: always @@ -102,11 +104,15 @@ jobs: compression-level: '0' merge: + name: Create Release Artifact runs-on: ubuntu-latest needs: [linux, macos, windows] steps: - - name: Merge Artifacts - uses: actions/upload-artifact/merge@v4 + # Note: due to the immutability of artifacts in upload-artifact v4, + # there cannot be mutliple upload-artifacts with the same name, in a sha's workflow runs. + # However in this case it is fine because this only runs on release/** branches, + # and the other runs on release-library/** branches. + - uses: actions/upload-artifact/merge@v4 with: # Craft expects release assets to be a single artifact named after the sha. name: ${{ github.sha }} diff --git a/.github/workflows/build_library.yml b/.github/workflows/build_library.yml index 181bbeded5..7d5d56f6a4 100644 --- a/.github/workflows/build_library.yml +++ b/.github/workflows/build_library.yml @@ -117,11 +117,15 @@ jobs: compression-level: '0' merge: + name: Create Release Artifact runs-on: ubuntu-latest needs: [linux, macos, sdist] steps: - - name: Merge Artifacts - uses: actions/upload-artifact/merge@v4 + # Note: due to the immutability of artifacts in upload-artifact v4, + # there cannot be mutliple upload-artifacts with the same name, in a sha's workflow runs. + # However in this case it is fine because this only runs on release-library/** branches, + # and the other runs on release/** branches. + - uses: actions/upload-artifact/merge@v4 with: # Craft expects release assets to be a single artifact named after the sha. name: ${{ github.sha }}