diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml index a84a2afc101be..a2afb5554265a 100644 --- a/.github/workflows/dispatch-build-bottle.yml +++ b/.github/workflows/dispatch-build-bottle.yml @@ -142,7 +142,7 @@ jobs: id-token: write # for actions/attest-build-provenance runs-on: ubuntu-latest needs: bottle - if: inputs.upload && !startsWith(inputs.runner, 15) + if: inputs.upload container: image: ghcr.io/homebrew/ubuntu22.04:master defaults: @@ -156,12 +156,12 @@ jobs: BOTTLE_BRANCH: ${{github.actor}}/dispatch/${{inputs.formula}}/${{github.run_id}} BOTTLES_DIR: ${{ github.workspace }}/bottles steps: - - name: Check that we're not uploading Sequioa bottles + - name: Check that we're not uploading Sequioa x86_64 bottles run: | - if [[ "${DISPATCH_BUILD_BOTTLE_RUNNER}" == "15"* ]] + if [[ "${DISPATCH_BUILD_BOTTLE_RUNNER}" == "15"* && "${RUNNER_ARCH}" == "X64" ]] then - echo "::error ::Refusing to upload bottles for macOS 15!" - echo "::error ::Please don't upload macOS 15 bottles yet, @${DISPATCH_BUILD_BOTTLE_SENDER}." + echo "::error ::Refusing to upload bottles for macOS 15 x86_64!" + echo "::error ::Please don't upload macOS 15 x86_64 bottles yet, @${DISPATCH_BUILD_BOTTLE_SENDER}." exit 1 fi