diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-13 12:40:34 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-13 08:40:46 -0400 |
| commit | 3c64e40e907660db0368f7229f0d45b4889145be (patch) | |
| tree | 9820910a33480006326b9d5e4a7d945c53354dee /.gitlab | |
| parent | ef0727f277cef71127e2e746ec9f5cec2673630e (diff) | |
| parent | cc93d2af0800dc2725f6f63d7ecb356f541cc65e (diff) | |
| download | cmake-3c64e40e907660db0368f7229f0d45b4889145be.tar.gz | |
Merge topic 'ci-msvc-19.32'
cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7259
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 3532765ace..4b4656af2d 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.31.31103" + VCVARSVERSION: "14.32.31326" .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.31.31103" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -173,7 +173,7 @@ - windows - shell - vs2022 - - msvc-19.31 + - msvc-19.32 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -182,7 +182,7 @@ - windows - shell - vs2022 - - msvc-19.31 + - msvc-19.32 - concurrent .windows_tags_concurrent_vs2019: |