mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 14:50:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-msvc-14.34'

Browse Source 
bd5176abac gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
ccdff280f4 gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7891
This commit is contained in:
Brad King
2022-11-11 13:29:02 +00:00
committed by Kitware Robot
parent b22715c144 bd5176abac
commit 96b939584b
2 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/os-windows.yml
+19 -40
View File
@@ -35,31 +35,19 @@
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.33.31629"
VCVARSVERSION: "14.34.31933"
.windows_vcvarsall_vs2022_x86:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.33.31629"
VCVARSVERSION: "14.34.31933"
.windows_vcvarsall_vs2022_x64_package:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.32.31326"
.windows_vcvarsall_vs2022_x86_package:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.32.31326"
.windows_vcvarsall_vs2022_x64_arm64_package:
.windows_vcvarsall_vs2022_x64_arm64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64"
VCVARSVERSION: "14.32.31326"
VCVARSVERSION: "14.34.31933"
.windows_vs2022_x64_ninja:
extends:
@@ -80,7 +68,7 @@
.windows_x86_64_package:
extends:
- .windows_package
- .windows_vcvarsall_vs2022_x64_package
- .windows_vcvarsall_vs2022_x64
variables:
CMAKE_CONFIGURATION: windows_x86_64_package
@@ -88,7 +76,7 @@
.windows_i386_package:
extends:
- .windows_package
- .windows_vcvarsall_vs2022_x86_package
- .windows_vcvarsall_vs2022_x86
variables:
CMAKE_CONFIGURATION: windows_i386_package
@@ -96,7 +84,7 @@
.windows_arm64_package:
extends:
- .windows_package
- .windows_vcvarsall_vs2022_x64_arm64_package
- .windows_vcvarsall_vs2022_x64_arm64
variables:
CMAKE_CONFIGURATION: windows_arm64_package
@@ -110,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.34.31933"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@@ -267,7 +255,16 @@
- windows
- shell
- vs2022
- msvc-19.33
- msvc-19.34
- nonconcurrent
.windows_tags_nonconcurrent_vs2022_arm64:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows
- shell
- vs2022
- msvc-19.34-arm64
- nonconcurrent
.windows_tags_concurrent_vs2022:
@@ -276,7 +273,7 @@
- windows
- shell
- vs2022
- msvc-19.33
- msvc-19.34
- concurrent
.windows_tags_concurrent_vs2019:
@@ -295,24 +292,6 @@
- shell
- concurrent
.windows_tags_x86_64_package:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows
- shell
- vs2022
- msvc-19.32
- nonconcurrent
.windows_tags_arm64_package:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows
- shell
- vs2022
- msvc-19.32-arm64
- nonconcurrent
## Windows-specific scripts
.before_script_windows: &before_script_windows