diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-24 14:20:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-24 14:20:35 (GMT) |
| commit | 472a11c3d2a725ebdd2efeef73b85bdadedb3f9a (patch) | |
| tree | 09c2579729697a40e37f15bb1d11210b55831ca5 /.gitlab | |
| parent | b7b0fb430397bafae4a7bd80b41d474c91a3b7f3 (diff) | |
| parent | 3a042bef8e5a1d5c03f9cad01c603b536b46ba6f (diff) | |
| download | CMake-472a11c3d2a725ebdd2efeef73b85bdadedb3f9a.zip CMake-472a11c3d2a725ebdd2efeef73b85bdadedb3f9a.tar.gz CMake-472a11c3d2a725ebdd2efeef73b85bdadedb3f9a.tar.bz2 | |
Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9
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 0b0a948..cd2f168 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.29333" + VCVARSVERSION: "14.28.29910" ### 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.29333" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" ## Tags @@ -60,7 +60,7 @@ - windows - shell - vs2019 - - msvc-19.28 + - msvc-19.28-16.9 - nonconcurrent .windows_builder_ext_tags: @@ -69,7 +69,7 @@ - windows - shell - vs2019 - - msvc-19.28 + - msvc-19.28-16.9 - concurrent ## Windows-specific scripts |