From b87645b6a57b3c37b28b74f93f6b189079eb67aa Mon Sep 17 00:00:00 2001 From: Brad King <brad.king@kitware.com> Date: Thu, 18 Aug 2022 09:41:08 -0400 Subject: 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 --- .gitlab/os-windows.yml | 10 +++++----- 1 file 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: -- cgit v0.12