From 71fea8fbf530277b34de9eddc607fe099f743809 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 29 Feb 2024 11:58:46 -0500
Subject: ci: Enable VSAndroid test in VS 2022 nightly job

---
 .gitlab-ci.yml                                | 17 +++++++++++++++--
 .gitlab/ci/configure_windows_vs2022_x64.cmake |  4 ++++
 .gitlab/os-windows.yml                        | 10 ++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39ab902..094f1e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1201,11 +1201,10 @@ t:windows-vs2022-x64-ninja-multi:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-vs2022-x64:
+.t:windows-vs2022-x64:
     extends:
         - .windows_vs2022_x64
         - .cmake_test_windows_external
-        - .windows_x86_64_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
@@ -1213,6 +1212,20 @@ t:windows-vs2022-x64:
     needs:
         - t:windows-vs2022-x64-ninja
 
+t:windows-vs2022-x64:
+    extends:
+        - .t:windows-vs2022-x64
+        - .windows_x86_64_tags_concurrent_vs2022
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "false"
+
+t:windows-vs2022-x64-nightly:
+    extends:
+        - .t:windows-vs2022-x64
+        - .windows_x86_64_tags_concurrent_vs2022_android
+    variables:
+        CMAKE_CI_JOB_NIGHTLY: "true"
+
 t:windows-vs2019-x64:
     extends:
         - .windows_vs2019_x64
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.
-- 
cgit v0.12