echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolset

Browse Source 
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
This commit is contained in:
Brad King 2022-08-17 12:28:31 -04:00
parent bc7dca3497
commit 3a7202bfc7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/os-windows.yml
View File

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