Skip to content
Snippets Groups Projects
Commit 9d5c9699 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'ci-msvc-toolset' into release-2.1


d0372e02 gitlab-ci: Fix mismatched MSVC toolset version and CI job tag

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea's avatarVicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3283
parents 67143d5b d0372e02
No related branches found
No related tags found
No related merge requests found
Pipeline #425739 failed
......@@ -29,7 +29,7 @@
variables:
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28.29333"
VCVARSVERSION: "14.28.29333" # sync with msvc-* version tags below
.cmake_build_windows: &cmake_build_windows
extends:
......@@ -108,7 +108,7 @@ build:windows_vs2019:
- windows-x86_64
- shell
- vs2019
- msvc-19.25
- msvc-19.28 # sync with VCVARSVERSION above
- large-memory
extends:
- .cmake_build_windows
......@@ -129,7 +129,7 @@ test:windows_vs2019:
- windows-x86_64
- shell
- vs2019
- msvc-19.25
- msvc-19.28 # sync with VCVARSVERSION above
- cuda-rt
- turing
extends:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment