Explorar el Código

Apply PR #23822: ci: add platform-specific bun install flags

opencode-agent[bot] hace 1 día
padre
commit
6f23da7bfa
Se han modificado 2 ficheros con 13 adiciones y 4 borrados
  1. 7 2
      .github/actions/setup-bun/action.yml
  2. 6 2
      .github/workflows/publish.yml

+ 7 - 2
.github/actions/setup-bun/action.yml

@@ -1,5 +1,10 @@
 name: "Setup Bun"
 name: "Setup Bun"
 description: "Setup Bun with caching and install dependencies"
 description: "Setup Bun with caching and install dependencies"
+inputs:
+  install-flags:
+    description: "Additional flags to pass to 'bun install'"
+    required: false
+    default: ""
 runs:
 runs:
   using: "composite"
   using: "composite"
   steps:
   steps:
@@ -46,8 +51,8 @@ runs:
         # e.g. ./patches/ for standard-openapi
         # e.g. ./patches/ for standard-openapi
         # https://github.com/oven-sh/bun/issues/28147
         # https://github.com/oven-sh/bun/issues/28147
         if [ "$RUNNER_OS" = "Windows" ]; then
         if [ "$RUNNER_OS" = "Windows" ]; then
-          bun install --linker hoisted
+          bun install --linker hoisted ${{ inputs.install-flags }}
         else
         else
-          bun install
+          bun install ${{ inputs.install-flags }}
         fi
         fi
       shell: bash
       shell: bash

+ 6 - 2
.github/workflows/publish.yml

@@ -402,12 +402,14 @@ jobs:
       fail-fast: false
       fail-fast: false
       matrix:
       matrix:
         settings:
         settings:
-          - host: macos-latest
+          - host: macos-26-intel
             target: x86_64-apple-darwin
             target: x86_64-apple-darwin
             platform_flag: --mac --x64
             platform_flag: --mac --x64
-          - host: macos-latest
+            bun_install_flags: --os=darwin --cpu=x64
+          - host: macos-26
             target: aarch64-apple-darwin
             target: aarch64-apple-darwin
             platform_flag: --mac --arm64
             platform_flag: --mac --arm64
+            bun_install_flags: --os=darwin --cpu=arm64
           # github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
           # github-hosted: blacksmith lacks ARM64 MSVC cross-compilation toolchain
           - host: "windows-2025"
           - host: "windows-2025"
             target: aarch64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
@@ -437,6 +439,8 @@ jobs:
         run: echo "${{ secrets.APPLE_API_KEY_PATH }}" > $RUNNER_TEMP/apple-api-key.p8
         run: echo "${{ secrets.APPLE_API_KEY_PATH }}" > $RUNNER_TEMP/apple-api-key.p8
 
 
       - uses: ./.github/actions/setup-bun
       - uses: ./.github/actions/setup-bun
+        with:
+          install-flags: ${{ matrix.settings.bun_install_flags }}
 
 
       - name: Azure login
       - name: Azure login
         if: runner.os == 'Windows'
         if: runner.os == 'Windows'