diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-09 17:17:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-09 17:17:31 (GMT) |
| commit | 0e097776fab7fa1235b5bb77f2f0b031c9c42e2d (patch) | |
| tree | e1f61d4c83c5d01aadafae7b9b25adb9ce50ec2b | |
| parent | 45e4ba11cde90a0ef05cf1acfc6c2e99ab480fc2 (diff) | |
| parent | 09c7c0a9c339bd95ac68809fe8e299eb09fbba88 (diff) | |
| download | CMake-0e097776fab7fa1235b5bb77f2f0b031c9c42e2d.zip CMake-0e097776fab7fa1235b5bb77f2f0b031c9c42e2d.tar.gz CMake-0e097776fab7fa1235b5bb77f2f0b031c9c42e2d.tar.bz2 | |
Merge topic 'ci-msvc-19.29-16.11' into release-3.21
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
| -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 90ff0a8..8037b33 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.29.30037" + VCVARSVERSION: "14.29.30133" ### 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.29.30037" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30133" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" ## Tags @@ -60,7 +60,7 @@ - windows - shell - vs2019 - - msvc-19.29-16.10 + - msvc-19.29-16.11 - nonconcurrent .windows_builder_ext_tags: @@ -69,7 +69,7 @@ - windows - shell - vs2019 - - msvc-19.29-16.10 + - msvc-19.29-16.11 - concurrent ## Windows-specific scripts |