From a0dd84bae4059c9a13f36b7c4fbcb0d21bdefd6d Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Tue, 10 Sep 2024 04:12:43 +0100
Subject: [PATCH] workflows/dispatch-build-bottle: enable 15-arm64 bottle
 uploads

---
 .github/workflows/dispatch-build-bottle.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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