Skip to content

Commit 0f43b4b

Browse files
bradkingkwrobot
authored andcommitted
Merge topic 'ci-msvc-14.29-16.10'
4c33b4e Merge branch 'master' into ci-msvc-14.29-16.10 59d9fa7 gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset Acked-by: Kitware Robot <[email protected]> Merge-request: !6172
2 parents dd6fd62 + 4c33b4e commit 0f43b4b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.gitlab/os-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
3939
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
4040
VCVARSPLATFORM: "x64"
41-
VCVARSVERSION: "14.28.29910"
41+
VCVARSVERSION: "14.29.30037"
4242

4343
### External testing
4444

@@ -49,7 +49,7 @@
4949
CMAKE_CONFIGURATION: windows_vs2019_x64
5050
CMAKE_GENERATOR: "Visual Studio 16 2019"
5151
CMAKE_GENERATOR_PLATFORM: "x64"
52-
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910"
52+
CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30037"
5353
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
5454

5555
## Tags
@@ -60,7 +60,7 @@
6060
- windows
6161
- shell
6262
- vs2019
63-
- msvc-19.28-16.9
63+
- msvc-19.29-16.10
6464
- nonconcurrent
6565

6666
.windows_builder_ext_tags:
@@ -69,7 +69,7 @@
6969
- windows
7070
- shell
7171
- vs2019
72-
- msvc-19.28-16.9
72+
- msvc-19.29-16.10
7373
- concurrent
7474

7575
## Windows-specific scripts

0 commit comments

Comments
 (0)