ci: Enable VSAndroid test in VS 2022 nightly job
This commit is contained in:
parent
85b28c8f83
commit
71fea8fbf5
@ -1201,11 +1201,10 @@ t:windows-vs2022-x64-ninja-multi:
|
|||||||
variables:
|
variables:
|
||||||
CMAKE_CI_JOB_NIGHTLY: "true"
|
CMAKE_CI_JOB_NIGHTLY: "true"
|
||||||
|
|
||||||
t:windows-vs2022-x64:
|
.t:windows-vs2022-x64:
|
||||||
extends:
|
extends:
|
||||||
- .windows_vs2022_x64
|
- .windows_vs2022_x64
|
||||||
- .cmake_test_windows_external
|
- .cmake_test_windows_external
|
||||||
- .windows_x86_64_tags_concurrent_vs2022
|
|
||||||
- .cmake_junit_artifacts
|
- .cmake_junit_artifacts
|
||||||
- .run_dependent
|
- .run_dependent
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -1213,6 +1212,20 @@ t:windows-vs2022-x64:
|
|||||||
needs:
|
needs:
|
||||||
- t:windows-vs2022-x64-ninja
|
- 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:
|
t:windows-vs2019-x64:
|
||||||
extends:
|
extends:
|
||||||
- .windows_vs2019_x64
|
- .windows_vs2019_x64
|
||||||
|
@ -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 "")
|
set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,shared" CACHE STRING "")
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake")
|
||||||
|
@ -337,6 +337,16 @@
|
|||||||
- msvc-19.36
|
- msvc-19.36
|
||||||
- concurrent
|
- 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:
|
.windows_x86_64_tags_concurrent_vs2019_android:
|
||||||
tags:
|
tags:
|
||||||
- cmake # Since this is a bare runner, pin to a project.
|
- cmake # Since this is a bare runner, pin to a project.
|
||||||
|
Loading…
Reference in New Issue
Block a user