diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-29 16:58:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-29 18:58:42 (GMT) |
| commit | 71fea8fbf530277b34de9eddc607fe099f743809 (patch) | |
| tree | 3fe642220a449bdfae8d00fc5996029e6f74772f /.gitlab | |
| parent | 85b28c8f834f4ff0221c0c7118c95161fbac77e8 (diff) | |
| download | CMake-71fea8fbf530277b34de9eddc607fe099f743809.zip CMake-71fea8fbf530277b34de9eddc607fe099f743809.tar.gz CMake-71fea8fbf530277b34de9eddc607fe099f743809.tar.bz2 | |
ci: Enable VSAndroid test in VS 2022 nightly job
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_vs2022_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake index 51ee514..c29a9ec 100644 --- a/.gitlab/ci/configure_windows_vs2022_x64.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake @@ -1,3 +1,7 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ANDROID_VS17 ON CACHE BOOL "") +endif() + set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,shared" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake") diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 0db89de..b6678b4 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -337,6 +337,16 @@ - msvc-19.36 - concurrent +.windows_x86_64_tags_concurrent_vs2022_android: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows-x86_64 + - shell + - vs2022 + - vs17-android + - msvc-19.36 + - concurrent + .windows_x86_64_tags_concurrent_vs2019_android: tags: - cmake # Since this is a bare runner, pin to a project. |