mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: Update Windows jobs to VS 2022

Browse Source
This commit is contained in:
Brad King
2021-11-11 12:11:17 -05:00
parent 39bdb1e332
commit b63a87582f
5 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
.gitlab-ci.yml
View File

@@ -723,37 +723,37 @@ upload:macos10.10-package:
# Windows builds # Windows builds
build:windows-vs2019-x64-ninja: build:windows-vs2022-x64-ninja:
extends: extends:
- .windows_vs2019_x64_ninja - .windows_vs2022_x64_ninja
- .cmake_build_windows - .cmake_build_windows
- .cmake_build_artifacts - .cmake_build_artifacts
- .windows_tags_nonconcurrent_vs2019 - .windows_tags_nonconcurrent_vs2022
- .run_manually - .run_manually
test:windows-vs2019-x64-ninja: test:windows-vs2022-x64-ninja:
extends: extends:
- .windows_vs2019_x64_ninja - .windows_vs2022_x64_ninja
- .cmake_test_windows - .cmake_test_windows
- .windows_tags_nonconcurrent_vs2019 - .windows_tags_nonconcurrent_vs2022
- .cmake_test_artifacts - .cmake_test_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- build:windows-vs2019-x64-ninja - build:windows-vs2022-x64-ninja
needs: needs:
- build:windows-vs2019-x64-ninja - build:windows-vs2022-x64-ninja
test:windows-vs2019-x64: test:windows-vs2022-x64:
extends: extends:
- .windows_vs2019_x64 - .windows_vs2022_x64
- .cmake_test_windows_external - .cmake_test_windows_external
- .windows_tags_concurrent_vs2019 - .windows_tags_concurrent_vs2022
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
needs: needs:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
test:windows-borland5.5: test:windows-borland5.5:
extends: extends:
@@ -763,9 +763,9 @@ test:windows-borland5.5:
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
needs: needs:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
@@ -777,9 +777,9 @@ test:windows-borland5.8:
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
needs: needs:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
@@ -791,9 +791,9 @@ test:windows-msvc-v71-nmake:
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
needs: needs:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"
@@ -805,8 +805,8 @@ test:windows-openwatcom1.9:
- .cmake_junit_artifacts - .cmake_junit_artifacts
- .run_dependent - .run_dependent
dependencies: dependencies:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
needs: needs:
- test:windows-vs2019-x64-ninja - test:windows-vs2022-x64-ninja
variables: variables:
CMAKE_CI_JOB_NIGHTLY: "true" CMAKE_CI_JOB_NIGHTLY: "true"

0
.gitlab/ci/configure_windows_vs2019_x64.cmake → .gitlab/ci/configure_windows_vs2022_x64.cmake
View File

0
.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake → .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake
View File

3
.gitlab/ci/download_qt.cmake
View File

@@ -18,7 +18,8 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows")
set(msvc_year "2015") set(msvc_year "2015")
set(qt_abi "win64_msvc${msvc_year}_64") set(qt_abi "win64_msvc${msvc_year}_64")
elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019") "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022")
set(qt_platform "windows_x86") set(qt_platform "windows_x86")
set(msvc_year "2019") set(msvc_year "2019")
set(qt_abi "win64_msvc${msvc_year}_64") set(qt_abi "win64_msvc${msvc_year}_64")

28
.gitlab/os-windows.yml
View File

@@ -31,25 +31,25 @@
CMAKE_CI_BUILD_TYPE: Release CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_NO_WARNINGS_ALLOWED: 1
.windows_vs2019_x64_ninja: .windows_vs2022_x64_ninja:
extends: .windows_ninja extends: .windows_ninja
variables: variables:
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja CMAKE_CONFIGURATION: windows_vs2022_x64_ninja
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.29.30133" VCVARSVERSION: "14.30.30705"
### External testing ### External testing
.windows_vs2019_x64: .windows_vs2022_x64:
extends: .windows extends: .windows
variables: variables:
CMAKE_CONFIGURATION: windows_vs2019_x64 CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 16 2019" CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64" CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30133" CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_borland: .windows_borland:
@@ -104,22 +104,22 @@
## Tags ## Tags
.windows_tags_nonconcurrent_vs2019: .windows_tags_nonconcurrent_vs2022:
tags: tags:
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.
- windows - windows
- shell - shell
- vs2019 - vs2022
- msvc-19.29-16.11 - msvc-19.30
- nonconcurrent - nonconcurrent
.windows_tags_concurrent_vs2019: .windows_tags_concurrent_vs2022:
tags: tags:
- cmake # Since this is a bare runner, pin to a project. - cmake # Since this is a bare runner, pin to a project.
- windows - windows
- shell - shell
- vs2019 - vs2022
- msvc-19.29-16.11 - msvc-19.30
- concurrent - concurrent
.windows_tags_concurrent: .windows_tags_concurrent: