diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-10 10:13:47 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-10 13:27:38 -0500 |
| commit | bd5176abac08b7b5f3a254fb9919bb1b5cd1ead6 (patch) | |
| tree | 67e4437524ac1daf4810e16321e89404d9272647 /.gitlab/os-windows.yml | |
| parent | ccdff280f4acebad0ac17d5d8380407c5dc606c0 (diff) | |
| download | cmake-bd5176abac08b7b5f3a254fb9919bb1b5cd1ead6.tar.gz | |
gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
Problems with `cmake-gui` when compiled with the MSVC 14.33 toolset,
that did not occur with the MSVC 14.32 toolset, no longer occur with the
MSVC 14.34 toolset. Revert commit cb8b27a901 (gitlab-ci: Use separate
MSVC toolset specification for packaging jobs, 2022-08-18, v3.24.2~24^2~1)
and update the remaining toolset version references.
Fixes: #23859
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 5fd1dc7643..eeed6405a8 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -43,23 +43,11 @@ VCVARSPLATFORM: "x86" VCVARSVERSION: "14.34.31933" -.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: +.windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.34.31933" .windows_vs2022_x64_ninja: extends: @@ -80,7 +68,7 @@ .windows_x86_64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64_package + - .windows_vcvarsall_vs2022_x64 variables: CMAKE_CONFIGURATION: windows_x86_64_package @@ -88,7 +76,7 @@ .windows_i386_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x86_package + - .windows_vcvarsall_vs2022_x86 variables: CMAKE_CONFIGURATION: windows_i386_package @@ -96,7 +84,7 @@ .windows_arm64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64_arm64_package + - .windows_vcvarsall_vs2022_x64_arm64 variables: CMAKE_CONFIGURATION: windows_arm64_package @@ -247,6 +235,15 @@ - msvc-19.34 - nonconcurrent +.windows_tags_nonconcurrent_vs2022_arm64: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - vs2022 + - msvc-19.34-arm64 + - nonconcurrent + .windows_tags_concurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. @@ -272,24 +269,6 @@ - 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 |