diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 574e8ab..39ab902 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1217,7 +1217,7 @@ t:windows-vs2019-x64: extends: - .windows_vs2019_x64 - .cmake_test_windows_external - - .windows_x86_64_tags_concurrent_vs2019 + - .windows_x86_64_tags_concurrent_vs2019_android - .cmake_junit_artifacts - .run_dependent dependencies: diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake index b859525..e4795b9 100644 --- a/.gitlab/ci/configure_windows_vs2019_x64.cmake +++ b/.gitlab/ci/configure_windows_vs2019_x64.cmake @@ -1,4 +1,5 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ANDROID_VS16 ON CACHE BOOL "") set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") endif() diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index c449ab8..0db89de 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -337,12 +337,13 @@ - msvc-19.36 - concurrent -.windows_x86_64_tags_concurrent_vs2019: +.windows_x86_64_tags_concurrent_vs2019_android: tags: - cmake # Since this is a bare runner, pin to a project. - windows-x86_64 - shell - vs2019 + - vs16-android - msvc-19.29-16.11 - concurrent |