Browse Source

ci: Enable VSAndroid test in VS 2019 nightly job

Brad King 1 year ago
parent
commit
85b28c8f83
3 changed files with 4 additions and 2 deletions
  1. 1 1
      .gitlab-ci.yml
  2. 1 0
      .gitlab/ci/configure_windows_vs2019_x64.cmake
  3. 2 1
      .gitlab/os-windows.yml

+ 1 - 1
.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:

+ 1 - 0
.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()
 

+ 2 - 1
.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