Skip to content

Commit 0c46380

Browse files
committed
GitHub CI: Adjust presets for uwp builds, disable 32-bit arm
Runners apparently now default to Windows SDK 10.0.26100.0, but are missing the corresponding ARM64 compilers. We can force an older Windows SDK, but CMake mysteriously fails to find WindowsApp.lib on arm (32 bit) then.
1 parent 20a38ab commit 0c46380

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/scripts/CMakePresets.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"inherits": "win32",
3333
"cacheVariables": {
3434
"CMAKE_SYSTEM_NAME": "WindowsStore",
35-
"CMAKE_SYSTEM_VERSION": "10.0"
35+
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
3636
}
3737
},
3838
{
@@ -45,7 +45,7 @@
4545
"inherits": "x64",
4646
"cacheVariables": {
4747
"CMAKE_SYSTEM_NAME": "WindowsStore",
48-
"CMAKE_SYSTEM_VERSION": "10.0"
48+
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
4949
}
5050
},
5151
{
@@ -54,7 +54,7 @@
5454
"architecture": "ARM",
5555
"cacheVariables": {
5656
"CMAKE_SYSTEM_NAME": "WindowsStore",
57-
"CMAKE_SYSTEM_VERSION": "10.0"
57+
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
5858
}
5959
},
6060
{
@@ -63,7 +63,7 @@
6363
"architecture": "ARM64",
6464
"cacheVariables": {
6565
"CMAKE_SYSTEM_NAME": "WindowsStore",
66-
"CMAKE_SYSTEM_VERSION": "10.0"
66+
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
6767
}
6868
},
6969
{

.github/scripts/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
VS_VERSION = "Visual Studio 17 2022"
1111

12-
PLATFORMS = ("Win32", "x64", "ARM", "ARM64")
12+
PLATFORMS = ("Win32", "x64", "ARM64") # "ARM",
1313

1414
TRUE_FALSE = (True, False)
1515

.github/workflows/windows-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- win32_uwp
3434
- x64_uwp
3535
- arm64_uwp
36-
- arm_uwp
36+
# - arm_uwp
3737

3838
uses: "./.github/workflows/msvc-build-preset.yml"
3939
with:

0 commit comments

Comments
 (0)