From c955d5c31f1b90fac2875a8d94a8c1477a5afa48 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 20 May 2025 10:19:10 -0400
Subject: ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset

Intel 2024.1 tools do not work with the MSVC 14.44 standard library.
---
 .gitlab-ci.yml         |  4 ++--
 .gitlab/os-windows.yml | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dce1ad1..f61070e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1209,7 +1209,7 @@ t:windows-intel2021.9.0-ninja:
     extends:
         - .windows_intelclassic_ninja
         - .cmake_test_windows_external
-        - .windows_x86_64_tags_concurrent_vs2022
+        - .windows_x86_64_tags_concurrent_vs2022_msvc14.43
         - .cmake_junit_artifacts
         - .run_dependent
     needs:
@@ -1222,7 +1222,7 @@ t:windows-oneapi2024.1.0-ninja:
     extends:
         - .windows_inteloneapi_ninja
         - .cmake_test_windows_external
-        - .windows_x86_64_tags_concurrent_vs2022
+        - .windows_x86_64_tags_concurrent_vs2022_msvc14.43
         - .cmake_junit_artifacts
         - .run_dependent
     needs:
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 89a5e4d..fad8845 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -31,6 +31,12 @@
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
+.windows_vcvarsall_vs2022_x64_msvc14.43:
+    variables:
+        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        VCVARSPLATFORM: "x64"
+        VCVARSVERSION: "14.43.34808"
+
 .windows_vcvarsall_vs2022_x64:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -232,7 +238,7 @@
 .windows_intelclassic_ninja:
     extends:
         - .windows_ninja
-        - .windows_vcvarsall_vs2022_x64
+        - .windows_vcvarsall_vs2022_x64_msvc14.43
 
     variables:
         CMAKE_CONFIGURATION: windows_intelclassic_ninja
@@ -240,7 +246,7 @@
 .windows_inteloneapi_ninja:
     extends:
         - .windows_ninja
-        - .windows_vcvarsall_vs2022_x64
+        - .windows_vcvarsall_vs2022_x64_msvc14.43
 
     variables:
         CMAKE_CONFIGURATION: windows_inteloneapi_ninja
@@ -337,6 +343,15 @@
         - msvc-14.43
         - concurrent
 
+.windows_x86_64_tags_concurrent_vs2022_msvc14.43:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows-x86_64
+        - shell
+        - vs2022
+        - msvc-14.43
+        - concurrent
+
 .windows_x86_64_tags_concurrent_vs2022_android:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-- 
cgit v0.12


From e37a40442a478dd92a02e76943f8adde492c0ced Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 19 May 2025 11:41:05 -0400
Subject: ci: Update Windows builds to MSVC 14.44 toolset

---
 .gitlab/os-windows.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index fad8845..06785b0 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -41,25 +41,25 @@
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.43.34808"
+        VCVARSVERSION: "14.44.35207"
 
 .windows_vcvarsall_vs2022_x86:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x86"
-        VCVARSVERSION: "14.43.34808"
+        VCVARSVERSION: "14.44.35207"
 
 .windows_vcvarsall_vs2022_x64_arm64:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64_arm64"
-        VCVARSVERSION: "14.43.34808"
+        VCVARSVERSION: "14.44.35207"
 
 .windows_arm64_vcvarsall_vs2022:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "arm64"
-        VCVARSVERSION: "14.43.34808"
+        VCVARSVERSION: "14.44.35207"
 
 .windows_vs2022_x64_pch:
     extends:
@@ -125,7 +125,7 @@
         CMAKE_CONFIGURATION: windows_vs2022_x64
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "x64"
-        CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 .windows_vs2019_x64:
@@ -288,7 +288,7 @@
         CMAKE_CONFIGURATION: windows_arm64_vs2022
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "ARM64"
-        CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 .mingw_osdn_io:
@@ -322,7 +322,7 @@
         - windows-x86_64
         - shell
         - vs2022
-        - msvc-14.43
+        - msvc-14.44
         - nonconcurrent
 
 .windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@@ -331,7 +331,7 @@
         - windows-x86_64
         - shell
         - vs2022
-        - msvc-14.43-arm64
+        - msvc-14.44-arm64
         - nonconcurrent
 
 .windows_x86_64_tags_concurrent_vs2022:
@@ -340,7 +340,7 @@
         - windows-x86_64
         - shell
         - vs2022
-        - msvc-14.43
+        - msvc-14.44
         - concurrent
 
 .windows_x86_64_tags_concurrent_vs2022_msvc14.43:
@@ -359,7 +359,7 @@
         - shell
         - vs2022
         - vs17-android
-        - msvc-14.43
+        - msvc-14.44
         - concurrent
 
 .windows_x86_64_tags_concurrent_vs2019_android:
@@ -385,7 +385,7 @@
         - windows-arm64
         - shell
         - vs2022
-        - msvc-14.43
+        - msvc-14.44
         - nonconcurrent
 
 .windows_arm64_tags_concurrent_vs2022:
@@ -394,7 +394,7 @@
         - windows-arm64
         - shell
         - vs2022
-        - msvc-14.43
+        - msvc-14.44
         - concurrent
 
 ## Windows-specific scripts
-- 
cgit v0.12