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:32 (GMT) |
| commit | 6ed656680d01b5edec5e13c37e47a76967901a37 (patch) | |
| tree | 4171bdef4a18766555508f64df9a9ee2b0f63d90 /.gitlab | |
| parent | ce6820fe215b8257bff7dc30fe5c57d8210adb09 (diff) | |
| parent | 09c7c0a9c339bd95ac68809fe8e299eb09fbba88 (diff) | |
| download | CMake-6ed656680d01b5edec5e13c37e47a76967901a37.zip CMake-6ed656680d01b5edec5e13c37e47a76967901a37.tar.gz CMake-6ed656680d01b5edec5e13c37e47a76967901a37.tar.bz2 | |
Merge topic 'ci-msvc-19.29-16.11'
09c7c0a9c3 gitlab-ci: Update Windows builds to MSVC 19.29-16.11 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6501
Diffstat (limited to '.gitlab')
| -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 |