echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: Update Windows builds to MSVC 14.36 toolset

Browse Source
This commit is contained in:
Brad King 2023-05-16 14:53:01 -04:00
parent ee0a157755
commit 888a9c49ff
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab/os-windows.yml
View File

@ -35,25 +35,25 @@
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.35.32215"
VCVARSVERSION: "14.36.32532"
.windows_vcvarsall_vs2022_x86:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.35.32215"
VCVARSVERSION: "14.36.32532"
.windows_vcvarsall_vs2022_x64_arm64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64"
VCVARSVERSION: "14.35.32215"
VCVARSVERSION: "14.36.32532"
.windows_arm64_vcvarsall_vs2022:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "arm64"
VCVARSVERSION: "14.35.32215"
VCVARSVERSION: "14.36.32532"
.windows_vs2022_x64_ninja:
extends:
@ -112,7 +112,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.35.32215"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.36.32532"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@ -261,7 +261,7 @@
CMAKE_CONFIGURATION: windows_arm64_vs2022
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.35.32215"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.36.32532"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io:
@ -295,7 +295,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-19.35
- msvc-19.36
- nonconcurrent
.windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@ -304,7 +304,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-19.35-arm64
- msvc-19.36-arm64
- nonconcurrent
.windows_x86_64_tags_concurrent_vs2022:
@ -313,7 +313,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-19.35
- msvc-19.36
- concurrent
.windows_x86_64_tags_concurrent_vs2019:
@ -338,7 +338,7 @@
- windows-arm64
- shell
- vs2022
- msvc-19.35
- msvc-19.36
- nonconcurrent
.windows_arm64_tags_concurrent_vs2022:
@ -347,7 +347,7 @@
- windows-arm64
- shell
- vs2022
- msvc-19.35
- msvc-19.36
- concurrent
## Windows-specific scripts