summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-28 14:57:17 (GMT)
committerBrad King <brad.king@kitware.com>2021-05-28 16:33:53 (GMT)
commit59d9fa713158610b6183b214841d0f272ee6f900 (patch)
treed2d0a1a16f83f651565170e3bc719f3753281089 /.gitlab
parentf4f80cfec6ba4667a2efce8c88d1e3d23f053cdc (diff)
downloadCMake-59d9fa713158610b6183b214841d0f272ee6f900.zip
CMake-59d9fa713158610b6183b214841d0f272ee6f900.tar.gz
CMake-59d9fa713158610b6183b214841d0f272ee6f900.tar.bz2
gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/os-windows.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index cd2f168..fb72ff1 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -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