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 | d2587ef1eb2266036312e37c6108adb9311dda8c (patch) | |
| tree | 21794a037966712f78820de4accb4f6b40ab6d18 /.gitlab | |
| parent | c0619861c9b4455c785c64d1d7b8cfcf8de5b9ae (diff) | |
| parent | a282714be91c39b8187188e90f6d0ff8dfa1f259 (diff) | |
| download | CMake-d2587ef1eb2266036312e37c6108adb9311dda8c.zip CMake-d2587ef1eb2266036312e37c6108adb9311dda8c.tar.gz CMake-d2587ef1eb2266036312e37c6108adb9311dda8c.tar.bz2 | |
Merge topic 'gitlab-ci-msvc-14.28'
a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5513
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 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 |