diff options
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -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 |
8 files changed, 47 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4b7c5ce15..b9b020b4c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -755,6 +755,20 @@ test:windows-vs2022-x64: needs: - test:windows-vs2022-x64-ninja +test:windows-vs2019-x64: + extends: + - .windows_vs2019_x64 + - .cmake_test_windows_external + - .windows_tags_concurrent_vs2019 + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - test:windows-vs2022-x64-ninja + needs: + - test:windows-vs2022-x64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + test:windows-borland5.5: extends: - .windows_borland5.5 diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake new file mode 100644 index 0000000000..c7d41ea1d4 --- /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 0000000000..c078f9049e --- /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 f6ece57c88..c7d41ea1d4 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 e1ae81e3d3..c078f9049e 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 0000000000..f6ece57c88 --- /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 0000000000..e1ae81e3d3 --- /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 f781c56f79..4ecc1201d7 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. |