mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-10 00:59:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update Windows packaging jobs to VS 20206

Browse Source 
Restore commit ffa010e32d (ci: Update Windows jobs to VS 2026,
2025-11-21, v4.2.1~28^2) now that we require Windows 10 anyway.

Issue: #27450
This commit is contained in:
Brad King
2025-12-08 20:31:25 -05:00
parent d54e15a5b8
commit 0a0bdaecdf
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -1636,7 +1636,7 @@ b:windows-x86_64-package:
- .windows_x86_64_package - .windows_x86_64_package
- .cmake_build_windows - .cmake_build_windows
- .cmake_build_package_artifacts - .cmake_build_package_artifacts
- .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44 - .windows_x86_64_tags_nonconcurrent_vs2026
- .run_only_for_package - .run_only_for_package
needs: needs:
- p:doc-package - p:doc-package
@@ -1667,7 +1667,7 @@ b:windows-i386-package:
- .windows_i386_package - .windows_i386_package
- .cmake_build_windows - .cmake_build_windows
- .cmake_build_package_artifacts - .cmake_build_package_artifacts
- .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44 - .windows_x86_64_tags_nonconcurrent_vs2026
- .run_only_for_package - .run_only_for_package
needs: needs:
- p:doc-package - p:doc-package

19
.gitlab/os-windows.yml
View File

@@ -43,12 +43,6 @@
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.44.35207" VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2022_x86_msvc14.44:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2026_x64: .windows_vcvarsall_vs2026_x64:
variables: variables:
VCVARSALL: "${VS180COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS180COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -107,7 +101,7 @@
.windows_x86_64_package: .windows_x86_64_package:
extends: extends:
- .windows_package - .windows_package
- .windows_vcvarsall_vs2022_x64_msvc14.44 - .windows_vcvarsall_vs2026_x64
variables: variables:
CMAKE_CONFIGURATION: windows_x86_64_package CMAKE_CONFIGURATION: windows_x86_64_package
@@ -115,7 +109,7 @@
.windows_i386_package: .windows_i386_package:
extends: extends:
- .windows_package - .windows_package
- .windows_vcvarsall_vs2022_x86_msvc14.44 - .windows_vcvarsall_vs2026_x86
variables: variables:
CMAKE_CONFIGURATION: windows_i386_package CMAKE_CONFIGURATION: windows_i386_package
@@ -409,15 +403,6 @@
- msvc-14.50 - msvc-14.50
- concurrent - concurrent
.windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows-x86_64
- shell
- vs2022
- msvc-14.44
- nonconcurrent
.windows_x86_64_tags_concurrent_vs2022_msvc14.44: .windows_x86_64_tags_concurrent_vs2022_msvc14.44:
tags: tags:
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.