diff options
author | Brad King <brad.king@kitware.com> | 2021-11-12 15:55:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-11-12 16:06:17 (GMT) |
commit | e731afd8b31260258dc30f2f6f5021e9ac5a865e (patch) | |
tree | 61279e5c2834f76e6ec440cba10b3b1411301aba /.gitlab | |
parent | 7315cd65dadcb77d835889d87223099ec95be8e9 (diff) | |
download | CMake-e731afd8b31260258dc30f2f6f5021e9ac5a865e.zip CMake-e731afd8b31260258dc30f2f6f5021e9ac5a865e.tar.gz CMake-e731afd8b31260258dc30f2f6f5021e9ac5a865e.tar.bz2 |
ci: Add VS 2019 nightly CI jobs
Now that the primary VS jobs have been converted to VS 2022,
add nightly CI jobs to cover VS 2019.
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake | 1 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64.cmake | 4 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake | 8 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common_ninja.cmake | 7 | ||||
-rw-r--r-- | .gitlab/os-windows.yml | 19 |
7 files changed, 33 insertions, 10 deletions
diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake new file mode 100644 index 0000000..c7d41ea --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2019_x64.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake new file mode 100644 index 0000000..c078f90 --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake index f6ece57..c7d41ea 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake @@ -1,3 +1 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake index e1ae81e..c078f90 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -1,7 +1 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") -set(CMake_TEST_GUI "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake") diff --git a/.gitlab/ci/configure_windows_vs_common.cmake b/.gitlab/ci/configure_windows_vs_common.cmake new file mode 100644 index 0000000..f6ece57 --- /dev/null +++ b/.gitlab/ci/configure_windows_vs_common.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs_common_ninja.cmake b/.gitlab/ci/configure_windows_vs_common_ninja.cmake new file mode 100644 index 0000000..e1ae81e --- /dev/null +++ b/.gitlab/ci/configure_windows_vs_common_ninja.cmake @@ -0,0 +1,7 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index f781c56..4ecc120 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -52,6 +52,16 @@ CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.windows_vs2019_x64: + extends: .windows + + variables: + CMAKE_CONFIGURATION: windows_vs2019_x64 + CMAKE_GENERATOR: "Visual Studio 16 2019" + CMAKE_GENERATOR_PLATFORM: "x64" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30133" + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + .windows_borland: extends: .windows @@ -122,6 +132,15 @@ - msvc-19.30 - concurrent +.windows_tags_concurrent_vs2019: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - vs2019 + - msvc-19.29-16.11 + - concurrent + .windows_tags_concurrent: tags: - cmake # Since this is a bare runner, pin to a project. |