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