diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-18 13:40:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-08-19 11:30:42 (GMT) |
| commit | cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf (patch) | |
| tree | 18a9fb6448eb344d02ca09a0af96792c4dabbb22 /.gitlab | |
| parent | 1702759063c3fe67b7124bfcf600ec1d121bf04c (diff) | |
| download | CMake-cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf.zip CMake-cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf.tar.gz CMake-cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf.tar.bz2 | |
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
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-windows.yml | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index b9b91fb..e693dcb 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 |