File tree Expand file tree Collapse file tree 2 files changed +11
-32
lines changed Expand file tree Collapse file tree 2 files changed +11
-32
lines changed Original file line number Diff line number Diff line change 17
17
os :
18
18
- ubuntu-24.04
19
19
- windows-2019
20
+ - macos-13
20
21
node_arch :
21
22
- x64
22
23
cpp_arch :
@@ -25,37 +26,34 @@ jobs:
25
26
- " "
26
27
native :
27
28
- true
28
-
29
29
include :
30
+ # Windows x86
30
31
- os : windows-2019
31
32
node_arch : ia32
32
33
cpp_arch : amd64_x86
33
34
native : true
34
35
35
- # - os: windows-2022
36
- # node_arch: x64
37
- # arch: arm64
38
- # cpp_arch: amd64_arm64
39
-
40
- - os : macos-13
36
+ # Windows Arm64
37
+ - os : windows-2022
41
38
node_arch : x64
42
- cpp_arch : x64
43
- native : true
39
+ arch : arm64
40
+ cpp_arch : amd64_arm64
44
41
42
+ # MacOS Arm64
45
43
- os : macos-14
46
44
node_arch : arm64
47
45
cpp_arch : amd64_arm64
48
46
native : true
49
47
50
- # Ubuntu x64
48
+ # Ubuntu 20.04 x64
51
49
- os : ubuntu-24.04
52
50
distro : ubuntu
53
51
platform : linux/amd64
54
52
node_arch : x64
55
53
cpp_arch : x64
56
54
native : false
57
55
58
- # Ubuntu Arm
56
+ # Ubuntu 20.04 Arm64
59
57
- os : ubuntu-24.04-arm
60
58
distro : ubuntu
61
59
platform : linux/arm64
@@ -146,14 +144,9 @@ jobs:
146
144
architecture : ${{ env.setup_node_arch }}
147
145
148
146
- name : Build Native
149
- if : ${{ matrix.native && matrix.node_arch != 'ia32' }}
147
+ if : ${{ matrix.native }}
150
148
run : npm run build.native
151
149
152
- - name : Build Native Windows 32
153
- if : ${{ matrix.os == 'windows-2019' && matrix.node_arch == 'ia32' }}
154
- run :
155
- node --enable-source-maps ./node_modules/cmake-ts/build/main.js build --config win32-ia32-release
156
-
157
150
- name : Use Node 20
158
151
if : ${{ matrix.native }}
159
152
uses : actions/setup-node@v4
Original file line number Diff line number Diff line change @@ -15,21 +15,7 @@ function cmakeTs() {
15
15
)
16
16
}
17
17
18
- // Default args
19
- let args = [ "nativeonly" ]
20
-
21
- if ( process . arch !== process . env . npm_config_target_arch || process . env . cross_compiling === "true" ) {
22
- // cross-compilation
23
- if ( process . platform === "win32" ) {
24
- if ( process . env . npm_config_target_arch === "ia32" ) {
25
- args = [ "named-configs" , "windows-x86" ]
26
- } else if ( process . env . npm_config_target_arch === "arm64" ) {
27
- args = [ "named-configs" , "windows-arm64" ]
28
- }
29
- }
30
- }
31
-
32
- cp . execFileSync ( process . execPath , [ cmakeTsPath , ...args ] , {
18
+ cp . execFileSync ( process . execPath , [ cmakeTsPath , "build" ] , {
33
19
stdio : "inherit" ,
34
20
} )
35
21
}
You can’t perform that action at this time.
0 commit comments