Skip to content

Commit b7f999b

Browse files
committed
ci: set the node target arch correctly
1 parent e450a7d commit b7f999b

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.github/workflows/CI.yml

+16-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1111
runs-on: ${{ matrix.os }}
1212
# prettier-ignore
13-
name: ${{ matrix.os }}-${{ matrix.node_arch }}-${{ matrix.dockerfile }}-${{ matrix.distro }}
13+
name: ${{ matrix.os }}-${{ matrix.node_target_arch }}-${{ matrix.dockerfile }}-${{ matrix.distro }}
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -19,6 +19,8 @@ jobs:
1919
- windows-2019
2020
node_arch:
2121
- x64
22+
node_target_arch:
23+
- x64
2224
cpp_arch:
2325
- x64
2426
dockerfile:
@@ -31,48 +33,55 @@ jobs:
3133
include:
3234
- os: windows-2019
3335
node_arch: ia32
36+
node_target_arch: ia32
3437
cpp_arch: amd64_x86
3538
native: true
3639

3740
- os: windows-2022
3841
node_arch: x64
42+
node_target_arch: arm64
3943
cpp_arch: amd64_arm64
4044
native: true
4145

4246
- os: macos-13
4347
node_arch: x64
48+
node_target_arch: x64
4449
cpp_arch: x64
4550
native: true
4651

4752
- os: macos-14
4853
node_arch: arm64
49-
cpp_arch: amd64_arm64
54+
node_target_arch: arm64
55+
cpp_arch: arm64
5056
native: true
5157

5258
# Musl Alpine
5359
- os: ubuntu-24.04
5460
dockerfile: docker/alpine.dockerfile
5561
node_arch: x64
62+
node_target_arch: x64
5663
cpp_arch: x64
5764
native: false
5865

5966
# Debian Arm
6067
- os: ubuntu-24.04
61-
node_arch: arm64
62-
cpp_arch: amd64_arm64
6368
distro: bookworm
69+
node_arch: arm64
70+
node_target_arch: arm64
71+
cpp_arch: arm64
6472
native: false
6573

6674
# Musl Alpine Arm
6775
- os: ubuntu-24.04
68-
node_arch: arm64
69-
cpp_arch: amd64_arm64
7076
distro: alpine_latest
77+
node_arch: arm64
78+
node_target_arch: arm64
79+
cpp_arch: arm64
7180
native: false
7281

7382
env:
7483
npm_config_arch: ${{ matrix.node_arch }}
75-
npm_config_target_arch: ${{ matrix.node_arch }}
84+
npm_config_target_arch: ${{ matrix.node_target_arch }}
7685
setup_node_arch: ${{ matrix.node_arch }}
7786
steps:
7887
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)