Merge topic 'ci-msvc-14.33'

b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7597

2 files changed, 44 insertions, 23 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfc713f8e8..fa11b1541a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1079,7 +1079,7 @@ b:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_nonconcurrent_vs2022
+        - .windows_tags_x86_64_package
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1093,7 +1093,7 @@ k:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_nonconcurrent_vs2022
+        - .windows_tags_x86_64_package
         - .run_only_for_package
     dependencies:
         - b:windows-x86_64-package
@@ -1116,7 +1116,7 @@ b:windows-i386-package:
         - .windows_i386_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_nonconcurrent_vs2022
+        - .windows_tags_x86_64_package
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1130,7 +1130,7 @@ k:windows-i386-package:
         - .windows_i386_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_nonconcurrent_vs2022
+        - .windows_tags_x86_64_package
         - .run_only_for_package
     dependencies:
         - b:windows-i386-package
@@ -1153,7 +1153,7 @@ b:windows-arm64-package:
         - .windows_arm64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_nonconcurrent_vs2022_arm64
+        - .windows_tags_arm64_package
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1167,7 +1167,7 @@ k:windows-arm64-package:
         - .windows_arm64_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_nonconcurrent_vs2022_arm64
+        - .windows_tags_arm64_package
         - .run_only_for_package
     dependencies:
         - b:windows-arm64-package
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index b9b91fb5c9..282cf1eb58 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -35,15 +35,27 @@
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.32.31326"
+        VCVARSVERSION: "14.33.31629"
 
 .windows_vcvarsall_vs2022_x86:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x86"
+        VCVARSVERSION: "14.33.31629"
+
+.windows_vcvarsall_vs2022_x64_package:
+    variables:
+        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        VCVARSPLATFORM: "x64"
+        VCVARSVERSION: "14.32.31326"
+
+.windows_vcvarsall_vs2022_x86_package:
+    variables:
+        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        VCVARSPLATFORM: "x86"
         VCVARSVERSION: "14.32.31326"
 
-.windows_vcvarsall_vs2022_x64_arm64:
+.windows_vcvarsall_vs2022_x64_arm64_package:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64_arm64"
@@ -68,7 +80,7 @@
 .windows_x86_64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x64
+        - .windows_vcvarsall_vs2022_x64_package
 
     variables:
         CMAKE_CONFIGURATION: windows_x86_64_package
@@ -76,7 +88,7 @@
 .windows_i386_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x86
+        - .windows_vcvarsall_vs2022_x86_package
 
     variables:
         CMAKE_CONFIGURATION: windows_i386_package
@@ -84,7 +96,7 @@
 .windows_arm64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x64_arm64
+        - .windows_vcvarsall_vs2022_x64_arm64_package
 
     variables:
         CMAKE_CONFIGURATION: windows_arm64_package
@@ -98,7 +110,7 @@
         CMAKE_CONFIGURATION: windows_vs2022_x64
         CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "x64"
-        CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 .windows_vs2019_x64:
@@ -232,16 +244,7 @@
         - windows
         - shell
         - vs2022
-        - msvc-19.32
-        - nonconcurrent
-
-.windows_tags_nonconcurrent_vs2022_arm64:
-    tags:
-        - cmake # Since this is a bare runner, pin to a project.
-        - windows
-        - shell
-        - vs2022
-        - msvc-19.32-arm64
+        - msvc-19.33
         - nonconcurrent
 
 .windows_tags_concurrent_vs2022:
@@ -250,7 +253,7 @@
         - windows
         - shell
         - vs2022
-        - msvc-19.32
+        - msvc-19.33
         - concurrent
 
 .windows_tags_concurrent_vs2019:
@@ -269,6 +272,24 @@
         - shell
         - concurrent
 
+.windows_tags_x86_64_package:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows
+        - shell
+        - vs2022
+        - msvc-19.32
+        - nonconcurrent
+
+.windows_tags_arm64_package:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows
+        - shell
+        - vs2022
+        - msvc-19.32-arm64
+        - nonconcurrent
+
 ## Windows-specific scripts
 
 .before_script_windows: &before_script_windows