diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-10 11:33:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-10 11:33:55 (GMT) |
| commit | ae585bdc12c155e472ea969e43dc75d36d6eef0d (patch) | |
| tree | 8ba71c563294173a3c73f3ee2393f6549999571b | |
| parent | 1aa51fb9e3ba3e9ddeafe4929c8f6f58a5fd34b7 (diff) | |
| parent | f2c303f4c716d62580ff7e9709a821ce2be6aed0 (diff) | |
| download | CMake-ae585bdc12c155e472ea969e43dc75d36d6eef0d.zip CMake-ae585bdc12c155e472ea969e43dc75d36d6eef0d.tar.gz CMake-ae585bdc12c155e472ea969e43dc75d36d6eef0d.tar.bz2 | |
Merge topic 'ci-msvc-19.31' into release-3.23
f2c303f4c7 Merge branch 'backport-3.22-ci-msvc-19.31' into ci-msvc-19.31
e66de43180 gitlab-ci: Update Windows builds to MSVC 19.31 toolset
fade5b5b8c gitlab-ci: Update Windows builds to MSVC 19.31 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7059
| -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 2bce8c8..aa971f8 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,7 +35,7 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.30.30705" + VCVARSVERSION: "14.31.31103" .windows_vs2022_x64_ninja: extends: @@ -54,7 +54,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.31.31103" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -149,7 +149,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -158,7 +158,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - concurrent .windows_tags_concurrent_vs2019: |