From cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 18 Aug 2022 09:40:02 -0400
Subject: gitlab-ci: Use separate MSVC toolset specification for packaging jobs

This will be useful for testing CMake with one version of MSVC
while packaging the official binaries with another version.

Issue: #23859
---
 .gitlab/os-windows.yml | 47 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 13 deletions(-)

(limited to '.gitlab/os-windows.yml')

diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index b9b91fb5c9..e693dcb455 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -43,7 +43,19 @@
         VCVARSPLATFORM: "x86"
         VCVARSVERSION: "14.32.31326"
 
-.windows_vcvarsall_vs2022_x64_arm64:
+.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_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
@@ -235,15 +247,6 @@
         - 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
-        - nonconcurrent
-
 .windows_tags_concurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
@@ -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
-- 
cgit v1.2.1