mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-24 16:49:18 -06:00
Merge topic 'ci-msvc-14.29-16.10' into release-3.20
59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6172
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user