Browse Source

Merge topic 'ci-msvc-19.31'

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
pull/348/head
Brad King 3 years ago
committed by Kitware Robot
parent
commit
7ada318350
  1. 8
      .gitlab/os-windows.yml

8
.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:
@ -173,7 +173,7 @@
- windows
- shell
- vs2022
- msvc-19.30
- msvc-19.31
- nonconcurrent
.windows_tags_concurrent_vs2022:
@ -182,7 +182,7 @@
- windows
- shell
- vs2022
- msvc-19.30
- msvc-19.31
- concurrent
.windows_tags_concurrent_vs2019:

Loading…
Cancel
Save