Skip to content

Commit 9785d0f

Browse files
committed
Update CI.yml
1 parent 2cdb0ee commit 9785d0f

File tree

1 file changed

+8
-38
lines changed

1 file changed

+8
-38
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
target: x86_64-unknown-linux-gnu
3636
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
3737
build: yarn build --target x86_64-unknown-linux-gnu --cargo-flags="--lib"
38-
# macOS x64 (Intel)
39-
- host: macos-13
38+
# macOS x64 (Intel) - cross-compile from ARM64
39+
- host: macos-14
4040
target: x86_64-apple-darwin
4141
build: yarn build --target x86_64-apple-darwin --cargo-flags="--lib"
4242
# macOS ARM64 (Apple Silicon)
43-
- host: macos-latest
43+
- host: macos-14
4444
target: aarch64-apple-darwin
4545
build: yarn build --target aarch64-apple-darwin --cargo-flags="--lib"
4646

@@ -155,44 +155,15 @@ jobs:
155155
- name: Test bindings
156156
run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test
157157

158-
# Test on macOS Intel
159-
test-macos-x64:
160-
name: Test - macOS x64 - node@${{ matrix.node }}
161-
needs: build
162-
strategy:
163-
fail-fast: false
164-
matrix:
165-
node: ['18', '20']
166-
runs-on: macos-13
167-
steps:
168-
- uses: actions/checkout@v4
169-
- name: Setup node
170-
uses: actions/setup-node@v4
171-
with:
172-
node-version: ${{ matrix.node }}
173-
cache: yarn
174-
- name: Install dependencies
175-
run: yarn install
176-
- name: Download artifacts
177-
uses: actions/download-artifact@v4
178-
with:
179-
name: bindings-x86_64-apple-darwin
180-
path: .
181-
- name: List packages
182-
run: ls -R .
183-
shell: bash
184-
- name: Test bindings
185-
run: yarn test
186-
187-
# Test on macOS ARM64
188-
test-macos-arm64:
158+
# Test on macOS (ARM64 - covers same code as x86_64)
159+
test-macos:
189160
name: Test - macOS ARM64 - node@${{ matrix.node }}
190161
needs: build
191162
strategy:
192163
fail-fast: false
193164
matrix:
194165
node: ['18', '20']
195-
runs-on: macos-latest
166+
runs-on: macos-14
196167
steps:
197168
- uses: actions/checkout@v4
198169
- name: Setup node
@@ -217,7 +188,7 @@ jobs:
217188
universal-macos:
218189
name: Build - macOS Universal
219190
needs: build
220-
runs-on: macos-latest
191+
runs-on: macos-14
221192
steps:
222193
- uses: actions/checkout@v4
223194
- name: Setup node
@@ -253,8 +224,7 @@ jobs:
253224
needs:
254225
- test-windows
255226
- test-linux
256-
- test-macos-x64
257-
- test-macos-arm64
227+
- test-macos
258228
- universal-macos
259229
steps:
260230
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)