diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-09 17:59:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-09 17:59:55 (GMT) |
| commit | dfdcb4fc3de2b9230eb6998e2486846ba8285df7 (patch) | |
| tree | d00335740de7ee7040a776f10fc9622b88842e34 | |
| parent | 90a9bff01ededffc33923cf8a9d7f6d0f162f8c7 (diff) | |
| parent | e66de431805dd56609587fd24ccf1a0753058803 (diff) | |
| download | CMake-dfdcb4fc3de2b9230eb6998e2486846ba8285df7.zip CMake-dfdcb4fc3de2b9230eb6998e2486846ba8285df7.tar.gz CMake-dfdcb4fc3de2b9230eb6998e2486846ba8285df7.tar.bz2 | |
Merge branch 'backport-3.22-ci-msvc-19.31' into release-3.22
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 a119433..806e7ca 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -38,7 +38,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64_ninja VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.30.30705" + VCVARSVERSION: "14.31.31103" ### External testing @@ -49,7 +49,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" ## Tags @@ -60,7 +60,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -69,7 +69,7 @@ - windows - shell - vs2022 - - msvc-19.30 + - msvc-19.31 - concurrent ## Windows-specific scripts |