From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Sun, 24 Nov 2024 13:34:40 +0000 (+0500)
Subject: Force use of latest Windows SDK with 32-bit ARM support
X-Git-Tag: 2.2.3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54569660a88416a8e21232949e336a92591e86db;p=thirdparty%2Fzlib-ng.git

Force use of latest Windows SDK with 32-bit ARM support

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 2611ebb4..ed1020df 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -502,7 +502,7 @@ jobs:
           - name: Windows MSVC ARM No Test
             os: windows-latest
             compiler: cl
-            cmake-args: -A ARM
+            cmake-args: -A ARM,version=10.0.22621.0
 
           - name: Windows MSVC ARM64 No Test
             os: windows-latest
diff --git a/.github/workflows/nmake.yml b/.github/workflows/nmake.yml
index 48689fff..9949d185 100644
--- a/.github/workflows/nmake.yml
+++ b/.github/workflows/nmake.yml
@@ -43,6 +43,7 @@ jobs:
             os: windows-2022
             makefile: win32/Makefile.arm
             arch: x86_arm
+            sdk: 10.0.22621.0
 
           - name: Windows NMake ARM64 No Test
             os: windows-2022
@@ -59,6 +60,7 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1.13.0
       with:
         arch: ${{ matrix.arch }}
+        sdk: ${{ matrix.sdk }}
 
     - name: Compile source code
       shell: cmd