diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-17 16:50:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-17 16:51:07 (GMT) |
| commit | 1bb359464fbd3321d155d5690afc755575638ca9 (patch) | |
| tree | 9462ca733366b2aa641eb2ceaa7af0b4f68b4f54 | |
| parent | 409e77aea8d073410472416335a487ca1a53ea04 (diff) | |
| parent | 3a7202bfc759187c1debcb75047d6b63caa4736c (diff) | |
| download | CMake-1bb359464fbd3321d155d5690afc755575638ca9.zip CMake-1bb359464fbd3321d155d5690afc755575638ca9.tar.gz CMake-1bb359464fbd3321d155d5690afc755575638ca9.tar.bz2 | |
Merge topic 'revert-ci-msvc-14.33'
3a7202bfc7 gitlab-ci: Revert Windows builds from MSVC 14.33 to MSVC 14.32 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7586
| -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 0cad7ac..b9b91fb 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.33.31629" + VCVARSVERSION: "14.32.31326" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.32.31326" .windows_vcvarsall_vs2022_x64_arm64: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" - VCVARSVERSION: "14.33.31629" + VCVARSVERSION: "14.32.31326" .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.33.31629" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -232,7 +232,7 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.32 - nonconcurrent .windows_tags_nonconcurrent_vs2022_arm64: @@ -241,7 +241,7 @@ - windows - shell - vs2022 - - msvc-19.33-arm64 + - msvc-19.32-arm64 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -250,7 +250,7 @@ - windows - shell - vs2022 - - msvc-19.33 + - msvc-19.32 - concurrent .windows_tags_concurrent_vs2019: |