Skip to content

Commit 8cc880d

Browse files
committed
feat(ci): add x86_64-apple-darwin to test and CLI E2E test matrices
Add Intel Mac (macos-15-intel) runner to both the `test` and `cli-e2e-test` CI jobs. Update the download-rolldown-binaries action to map target triples to npm binding package names so the correct darwin-x64 binary is fetched for x86_64-apple-darwin.
1 parent d8fe16b commit 8cc880d

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

.github/actions/download-rolldown-binaries/action.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,20 @@ runs:
2020
- name: Install previous release
2121
shell: bash
2222
run: |
23-
if ${{ runner.os == 'Windows' }}; then
24-
export TARGET="win32-x64-msvc"
25-
elif ${{ runner.os == 'Linux' }}; then
26-
export TARGET="linux-x64-gnu"
27-
elif ${{ runner.os == 'macOS' }}; then
28-
export TARGET="darwin-arm64"
29-
fi
23+
case "${{ inputs.target }}" in
24+
x86_64-pc-windows-msvc|aarch64-pc-windows-msvc) export TARGET="win32-x64-msvc" ;;
25+
x86_64-unknown-linux-gnu) export TARGET="linux-x64-gnu" ;;
26+
aarch64-unknown-linux-gnu) export TARGET="linux-arm64-gnu" ;;
27+
aarch64-apple-darwin) export TARGET="darwin-arm64" ;;
28+
x86_64-apple-darwin) export TARGET="darwin-x64" ;;
29+
*)
30+
# Fallback for callers that don't pass a target
31+
if ${{ runner.os == 'Windows' }}; then export TARGET="win32-x64-msvc"
32+
elif ${{ runner.os == 'Linux' }}; then export TARGET="linux-x64-gnu"
33+
elif ${{ runner.os == 'macOS' }}; then export TARGET="darwin-arm64"
34+
fi
35+
;;
36+
esac
3037
3138
# Pin to the version from checked-out rolldown source to avoid mismatch
3239
# between JS code (built from source) and native binary (downloaded from npm).

.github/workflows/ci.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ jobs:
6565
target: x86_64-pc-windows-msvc
6666
- os: namespace-profile-mac-default
6767
target: aarch64-apple-darwin
68+
- os: macos-15-intel
69+
target: x86_64-apple-darwin
6870
runs-on: ${{ matrix.os }}
6971
steps:
7072
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -176,8 +178,13 @@ jobs:
176178
matrix:
177179
include:
178180
- os: ubuntu-latest
181+
target: x86_64-unknown-linux-gnu
179182
- os: namespace-profile-mac-default
183+
target: aarch64-apple-darwin
180184
- os: windows-latest
185+
target: x86_64-pc-windows-msvc
186+
- os: macos-15-intel
187+
target: x86_64-apple-darwin
181188
runs-on: ${{ matrix.os }}
182189
steps:
183190
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -208,7 +215,7 @@ jobs:
208215
- name: Build with upstream
209216
uses: ./.github/actions/build-upstream
210217
with:
211-
target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || matrix.os == 'windows-latest' && 'x86_64-pc-windows-msvc' || 'aarch64-apple-darwin' }}
218+
target: ${{ matrix.target }}
212219

213220
- name: Build CLI
214221
run: |

0 commit comments

Comments
 (0)