diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-17 12:28:31 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-08-17 12:43:07 -0400 |
| commit | 3a7202bfc759187c1debcb75047d6b63caa4736c (patch) | |
| tree | 74ec566f7df28216f7ccf0042def046f5420b58b /.gitlab/os-windows.yml | |
| parent | bc7dca3497e1bcedfcdf646708bcec169f3d45b4 (diff) | |
| download | cmake-3a7202bfc759187c1debcb75047d6b63caa4736c.tar.gz | |
gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolset
Revert commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33
toolset, 2022-08-15). A `cmake-gui` built with the MSVC 14.33 toolset
emits spurious errors when configuring CMake projects, even when the
adjacent `cmake` binary succeeds reliably. Revert to the known-working
MSVC 14.32 toolset pending further investigation.
Issue: #23859
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 0cad7acb41..b9b91fb5c9 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,19 +35,19 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.32.31326" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.32.31326" .windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.32.31326" .windows_vs2022_x64_ninja: extends: @@ -98,7 +98,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -232,7 +232,7 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.32 - nonconcurrent .windows_tags_nonconcurrent_vs2022_arm64: @@ -241,7 +241,7 @@ - windows - shell - vs2022 - - msvc-19.33-arm64 + - msvc-19.32-arm64 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -250,7 +250,7 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.32 - concurrent .windows_tags_concurrent_vs2019: |