Skip to content
Snippets Groups Projects
Commit b9ee6db4 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'ci-msvc-14.29-16.10' into release-3.20


59d9fa71 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !6172
parents ddd13207 59d9fa71
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28.29910"
VCVARSVERSION: "14.29.30037"
### External testing
......@@ -49,7 +49,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64
CMAKE_GENERATOR: "Visual Studio 16 2019"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30037"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags
......@@ -60,7 +60,7 @@
- windows
- shell
- vs2019
- msvc-19.28-16.9
- msvc-19.29-16.10
- nonconcurrent
.windows_builder_ext_tags:
......@@ -69,7 +69,7 @@
- windows
- shell
- vs2019
- msvc-19.28-16.9
- msvc-19.29-16.10
- concurrent
## Windows-specific scripts
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment