From a0f85760ac0acdb948536cd440519171f1598b04 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 28 Feb 2024 16:02:20 -0500 Subject: gitlab-ci: add rules to suppress jobs in a nightly pipeline schedule --- .gitlab/rules.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index b85b728..0402d33 100644 --- a/.gitlab/rules.yml +++ b/.gitlab/rules.yml @@ -4,6 +4,8 @@ rules: - if: '$CMAKE_CI_PACKAGE != null' when: never + - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_JOB_NIGHTLY == "false")' + when: never - if: '$CMAKE_CI_NIGHTLY == "true"' when: on_success - if: '$CMAKE_CI_JOB_NIGHTLY == "true"' @@ -25,6 +27,8 @@ rules: - if: '$CMAKE_CI_PACKAGE != null' when: never + - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_JOB_NIGHTLY == "false")' + when: never - if: '$CMAKE_CI_NIGHTLY == "true"' when: on_success - if: '$CMAKE_CI_JOB_NIGHTLY == "true"' @@ -46,6 +50,8 @@ rules: - if: '$CMAKE_CI_PACKAGE != null' when: never + - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_JOB_NIGHTLY == "false")' + when: never - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")' when: always - if: '$CMAKE_CI_NIGHTLY == "true"' -- cgit v0.12 From f2092b02d527402d8ed08a931edbabcf6325da7c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 28 Feb 2024 14:23:43 -0500 Subject: Tests/VSAndroid: Update for VS 17 --- Tests/VSAndroid/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/VSAndroid/CMakeLists.txt b/Tests/VSAndroid/CMakeLists.txt index 73b1e07..774ffc0 100644 --- a/Tests/VSAndroid/CMakeLists.txt +++ b/Tests/VSAndroid/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3) project(VSAndroid C CXX) set(CMAKE_ANDROID_ARCH armv7-a) -set(CMAKE_ANDROID_STL_TYPE stlport_shared) +set(CMAKE_ANDROID_STL_TYPE c++_shared) set(CMAKE_ANDROID_API_MIN 9) set(CMAKE_ANDROID_API 15) set(CMAKE_ANDROID_GUI 1) -- cgit v0.12 From 85b28c8f834f4ff0221c0c7118c95161fbac77e8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 29 Feb 2024 11:18:59 -0500 Subject: ci: Enable VSAndroid test in VS 2019 nightly job --- .gitlab-ci.yml | 2 +- .gitlab/ci/configure_windows_vs2019_x64.cmake | 1 + .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 -- cgit v0.12 From 71fea8fbf530277b34de9eddc607fe099f743809 Mon Sep 17 00:00:00 2001 From: Brad King 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