diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-17 21:40:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-17 21:40:43 (GMT) |
| commit | ca9a182d23f6d33c75fa89803cb24881b132ddba (patch) | |
| tree | 620b1cf52fc00644641c08293920dcb71bce6eed | |
| parent | c9764c902dad40de397b6431ca7172fbdf02ca31 (diff) | |
| parent | a282714be91c39b8187188e90f6d0ff8dfa1f259 (diff) | |
| download | CMake-ca9a182d23f6d33c75fa89803cb24881b132ddba.zip CMake-ca9a182d23f6d33c75fa89803cb24881b132ddba.tar.gz CMake-ca9a182d23f6d33c75fa89803cb24881b132ddba.tar.bz2 | |
Merge topic 'gitlab-ci-msvc-14.28' into release-3.19
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5513
| -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 6830b8a..2e21fdf 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.27" + VCVARSVERSION: "14.28" ### 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.27" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.28" ## Tags @@ -59,7 +59,7 @@ - windows - shell - vs2019 - - msvc-19.27 + - msvc-19.28 - nonconcurrent .windows_builder_ext_tags: @@ -68,7 +68,7 @@ - windows - shell - vs2019 - - msvc-19.27 + - msvc-19.28 - concurrent ## Windows-specific scripts |