diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0f6aaca..81014efa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,9 +51,9 @@ jobs: target: x86_64-unknown-linux-gnu - os: windows-latest target: x86_64-pc-windows-msvc - - os: namespace-profile-mac-default + - os: macos-latest target: aarch64-apple-darwin - - os: namespace-profile-mac-default + - os: macos-latest target: x86_64-apple-darwin runs-on: ${{ matrix.os }} steps: @@ -91,8 +91,13 @@ jobs: continue-on-error: true run: cargo clippy --all-targets --all-features -- -D warnings - # Set up node and pnpm for running tests - # For x86_64-apple-darwin, use x64 node for fspy tests that verify Node.js fs accesses + # For x86_64-apple-darwin on arm64 runner, install x64 node so fspy preload dylib + # (compiled for x86_64) can be injected into node processes running under Rosetta. + # oxc-project/setup-node doesn't support the architecture input, so use + # pnpm/action-setup + actions/setup-node directly. + - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0 + if: ${{ matrix.target == 'x86_64-apple-darwin' }} + - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0 with: node-version-file: .node-version