From 7330750f1f927411121fd7ac7d4d0c0d802ee9f1 Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Thu, 7 Nov 2024 15:13:50 -0500
Subject: [PATCH] [CI] Set right architecture for x64 macOS release artifact

This is needed now that we cross-compile from an Apple Silicon image.
---
 .github/workflows/release.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 29784c26768..da7c0663ed9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,12 +61,17 @@ jobs:
           - os-name: linux
             os: ubuntu-20.04
             bazel-config: release_linux
+            target-arch: X64
           - os-name: macOS
+            # This configuration is used for cross-compiling – macos-15 is Apple Silicon-based but
+            # we use it to compile the x64 release.
             os: macos-15
             bazel-config: release_macos
+            target-arch: X64
           - os-name: windows
             os: windows-2022
             bazel-config: release_windows
+            target-arch: X64
     runs-on: ${{ matrix.os }}
     name: build (${{ matrix.os-name }})
     steps:
@@ -126,7 +131,7 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-${{ runner.arch }}-binary
+          name: ${{ runner.os }}-${{ matrix.target-arch }}-binary
           path: bazel-bin/src/workerd/server/workerd${{ runner.os == 'Windows' && '.exe' || '' }}
 
   upload-artifacts: