diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-18 13:41:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-08-19 11:30:54 (GMT) |
| commit | b87645b6a57b3c37b28b74f93f6b189079eb67aa (patch) | |
| tree | a08daa94d9e7b790ee70e13bb31b2d9737bf2268 | |
| parent | cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf (diff) | |
| download | CMake-b87645b6a57b3c37b28b74f93f6b189079eb67aa.zip CMake-b87645b6a57b3c37b28b74f93f6b189079eb67aa.tar.gz CMake-b87645b6a57b3c37b28b74f93f6b189079eb67aa.tar.bz2 | |
gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
Restore the change from commit 6f17996edc (gitlab-ci: Update Windows
builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for
packaging jobs. `cmake-gui` is still buggy when compiled with
the newer toolset.
Issue: #23859
| -rw-r--r-- | .gitlab/os-windows.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index e693dcb..282cf1e 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,13 +35,13 @@ 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.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vcvarsall_vs2022_x64_package: variables: @@ -110,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: @@ -244,7 +244,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -253,7 +253,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - concurrent .windows_tags_concurrent_vs2019: |