diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-28 18:24:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-28 18:24:56 (GMT) |
| commit | 0f43b4b8968e92461d7bd5a263a694570b9b9295 (patch) | |
| tree | a379c917e1fe9e678ad2b2a6a183569d1c91c66d | |
| parent | dd6fd62615ef816f5cbdbd8cd5f827a5cc360464 (diff) | |
| parent | 4c33b4e3b10109288d59d7cd17853f814754b024 (diff) | |
| download | CMake-0f43b4b8968e92461d7bd5a263a694570b9b9295.zip CMake-0f43b4b8968e92461d7bd5a263a694570b9b9295.tar.gz CMake-0f43b4b8968e92461d7bd5a263a694570b9b9295.tar.bz2 | |
Merge topic 'ci-msvc-14.29-16.10'
4c33b4e3b1 Merge branch 'master' into ci-msvc-14.29-16.10
59d9fa7131 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6172
| -rw-r--r-- | .gitlab/os-windows.yml | 8 |
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 |