From 14fc397c9513b6ab15015b4518a0d9bf8195b320 Mon Sep 17 00:00:00 2001
From: Brendan Allan <git@brendonovich.dev>
Date: Wed, 22 Apr 2026 17:32:06 +0800
Subject: [PATCH 1/4] ci: add platform-specific bun install flags

---
 .github/actions/setup-bun/action.yml | 9 +++++++--
 .github/workflows/publish.yml        | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-bun/action.yml b/.github/actions/setup-bun/action.yml
index d1e3bfc25d0c..9859174a2e35 100644
--- a/.github/actions/setup-bun/action.yml
+++ b/.github/actions/setup-bun/action.yml
@@ -1,5 +1,10 @@
 name: "Setup Bun"
 description: "Setup Bun with caching and install dependencies"
+inputs:
+  install-flags:
+    description: "Additional flags to pass to 'bun install'"
+    required: false
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -46,8 +51,8 @@ runs:
         # e.g. ./patches/ for standard-openapi
         # https://github.com/oven-sh/bun/issues/28147
         if [ "$RUNNER_OS" = "Windows" ]; then
-          bun install --linker hoisted
+          bun install --linker hoisted ${{ inputs.install-flags }}
         else
-          bun install
+          bun install ${{ inputs.install-flags }}
         fi
       shell: bash
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index af008f6b17e3..81a72202455b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -405,22 +405,28 @@ jobs:
           - host: macos-latest
             target: x86_64-apple-darwin
             platform_flag: --mac --x64
+            bun_install_flags: --os=darwin --cpu=x64
           - host: macos-latest
             target: aarch64-apple-darwin
             platform_flag: --mac --arm64
+            bun_install_flags: --os=darwin --cpu=arm64
           # github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
           - host: "windows-2025"
             target: aarch64-pc-windows-msvc
             platform_flag: --win --arm64
+            bun_install_flags: --os=win32 --cpu=arm64
           - host: "blacksmith-4vcpu-windows-2025"
             target: x86_64-pc-windows-msvc
             platform_flag: --win
+            bun_install_flags: --os=win32 --cpu=x64
           - host: "blacksmith-4vcpu-ubuntu-2404"
             target: x86_64-unknown-linux-gnu
             platform_flag: --linux
+            bun_install_flags: --os=linux --cpu=x64
           - host: "blacksmith-4vcpu-ubuntu-2404"
             target: aarch64-unknown-linux-gnu
             platform_flag: --linux
+            bun_install_flags: --os=linux --cpu=arm64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3

From a69e79f47bc68e0e8e08930e16d8708879baba56 Mon Sep 17 00:00:00 2001
From: Brendan Allan <git@brendonovich.dev>
Date: Thu, 23 Apr 2026 11:58:40 +0800
Subject: [PATCH 2/4] actually pass through install flags

---
 .github/workflows/publish.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 81a72202455b..5bc852322e02 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -443,6 +443,8 @@ jobs:
         run: echo "${{ secrets.APPLE_API_KEY_PATH }}" > $RUNNER_TEMP/apple-api-key.p8
 
       - uses: ./.github/actions/setup-bun
+        with:
+          install-flags: ${{ matrix.settings.bun_install_flags }}
 
       - name: Azure login
         if: runner.os == 'Windows'

From 3ede0898c9ec9ccf338b5560fb9bd79757e7755a Mon Sep 17 00:00:00 2001
From: Brendan Allan <git@brendonovich.dev>
Date: Thu, 23 Apr 2026 13:34:13 +0800
Subject: [PATCH 3/4] use intel runner for intel

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5bc852322e02..3cbf046e4831 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -402,11 +402,11 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-26-intel
             target: x86_64-apple-darwin
             platform_flag: --mac --x64
             bun_install_flags: --os=darwin --cpu=x64
-          - host: macos-latest
+          - host: macos-26
             target: aarch64-apple-darwin
             platform_flag: --mac --arm64
             bun_install_flags: --os=darwin --cpu=arm64

From 981216634d3668bd218de499ca298c37f22031e5 Mon Sep 17 00:00:00 2001
From: Brendan Allan <git@brendonovich.dev>
Date: Thu, 23 Apr 2026 14:22:13 +0800
Subject: [PATCH 4/4] only differentiate bun install on macos

---
 .github/workflows/publish.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3cbf046e4831..6cb6af0a8ddd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -414,19 +414,15 @@ jobs:
           - host: "windows-2025"
             target: aarch64-pc-windows-msvc
             platform_flag: --win --arm64
-            bun_install_flags: --os=win32 --cpu=arm64
           - host: "blacksmith-4vcpu-windows-2025"
             target: x86_64-pc-windows-msvc
             platform_flag: --win
-            bun_install_flags: --os=win32 --cpu=x64
           - host: "blacksmith-4vcpu-ubuntu-2404"
             target: x86_64-unknown-linux-gnu
             platform_flag: --linux
-            bun_install_flags: --os=linux --cpu=x64
           - host: "blacksmith-4vcpu-ubuntu-2404"
             target: aarch64-unknown-linux-gnu
             platform_flag: --linux
-            bun_install_flags: --os=linux --cpu=arm64
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v3