Skip to content

Commit 9398dcb

Browse files
committed
Simplify the rules for windows build.
1 parent 1a82087 commit 9398dcb

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

.github/workflows/cmake.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ jobs:
1717
build:
1818
strategy:
1919
matrix:
20-
os: [ ubuntu-latest, windows-latest, macos-latest ]
21-
arch: [ x64 ]
20+
os: [ ubuntu-latest, macos-latest ]
21+
arch: [ '' ]
2222
include:
2323
- os: windows-latest
24-
arch: x86
24+
arch: Win32
25+
- os: windows-latest
26+
arch: x64
27+
- os: windows-11-arm
28+
arch: ARM64
29+
2530
runs-on: ${{ matrix.os }}
2631

2732
permissions:
@@ -36,13 +41,7 @@ jobs:
3641

3742
- name: Config for Windows
3843
if: runner.os == 'Windows'
39-
run: |
40-
if ("${{matrix.arch}}" -eq "x64") {
41-
$msbuildPlatform = "x64"
42-
} else {
43-
$msbuildPlatform = "Win32"
44-
}
45-
cmake -A $msbuildPlatform -B build -DSPM_BUILD_TEST=ON -DSPM_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=build/root
44+
run: cmake -A ${{ matrix.arch }} -B build -DSPM_BUILD_TEST=ON -DSPM_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=build/root
4645

4746
- name: Config for Linux/MacOSX
4847
if: runner.os != 'Windows'

0 commit comments

Comments
 (0)