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
This commit is contained in:
Brad King 2022-08-18 09:41:08 -04:00
parent cb8b27a901
commit b87645b6a5

View File

@ -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: