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.
KhronosGroup · Nov 27, 2024 · 0c46380 · 0c46380
1 parent 20a38ab
commit 0c46380
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/scripts/CMakePresets.json b/.github/scripts/CMakePresets.json
@@ -32,7 +32,7 @@
             "inherits": "win32",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -45,7 +45,7 @@
             "inherits": "x64",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -54,7 +54,7 @@
             "architecture": "ARM",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {
@@ -63,7 +63,7 @@
             "architecture": "ARM64",
             "cacheVariables": {
                 "CMAKE_SYSTEM_NAME": "WindowsStore",
-                "CMAKE_SYSTEM_VERSION": "10.0"
+                "CMAKE_SYSTEM_VERSION": "10.0.22000.0"
             }
         },
         {

diff --git a/.github/scripts/shared.py b/.github/scripts/shared.py
@@ -9,7 +9,7 @@
 
 VS_VERSION = "Visual Studio 17 2022"
 
-PLATFORMS = ("Win32", "x64", "ARM", "ARM64")
+PLATFORMS = ("Win32", "x64", "ARM64")  # "ARM",
 
 TRUE_FALSE = (True, False)
 

diff --git a/.github/workflows/windows-matrix.yml b/.github/workflows/windows-matrix.yml
@@ -33,7 +33,7 @@ jobs:
           - win32_uwp
           - x64_uwp
           - arm64_uwp
-          - arm_uwp
+          # - arm_uwp
 
     uses: "./.github/workflows/msvc-build-preset.yml"
     with: