diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-17 12:33:53 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-17 08:34:06 -0400 |
| commit | 8a2eafe485adb755be7dcb7c93454b81adbb91b1 (patch) | |
| tree | 9632051a6bcf1282861a00e5e17a6da5488f3a03 /.gitlab | |
| parent | eb10bcb9fcdf9573cc1c7505b66a9c6ae90066a6 (diff) | |
| parent | 6f17996edc0121d6f5d48dc53792c2c6eb9b72a8 (diff) | |
| download | cmake-8a2eafe485adb755be7dcb7c93454b81adbb91b1.tar.gz | |
Merge topic 'ci-msvc-14.33'
6f17996edc gitlab-ci: Update Windows builds to MSVC 14.33 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7578
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-windows.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index b9b91fb5c9..0cad7acb41 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,19 +35,19 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vs2022_x64_ninja: extends: @@ -98,7 +98,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -232,7 +232,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - nonconcurrent .windows_tags_nonconcurrent_vs2022_arm64: @@ -241,7 +241,7 @@ - windows - shell - vs2022 - - msvc-19.32-arm64 + - msvc-19.33-arm64 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -250,7 +250,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - concurrent .windows_tags_concurrent_vs2019: |