diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-21 15:15:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-21 17:25:47 (GMT) |
| commit | 557c3934ee744a0b8707dc5b0846d5692588f4db (patch) | |
| tree | bc6ee046a7e22a72e953a3c970c5336e15fec8c2 | |
| parent | d3ea15e80152511946c719404466dfa199532005 (diff) | |
| download | CMake-557c3934ee744a0b8707dc5b0846d5692588f4db.zip CMake-557c3934ee744a0b8707dc5b0846d5692588f4db.tar.gz CMake-557c3934ee744a0b8707dc5b0846d5692588f4db.tar.bz2 | |
gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64
| -rw-r--r-- | .gitlab-ci.yml | 28 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_ninja_ub.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/env_macos_x86_64_ninja_ub.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/env_macos_x86_64_xcode_ub.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 15 |
6 files changed, 49 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56e934b..157f779 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -912,6 +912,34 @@ t:macos-arm64-xcode: variables: CMAKE_CI_NO_MR: "true" +t:macos-x86_64-ninja-ub: + extends: + - .macos_x86_64_ninja_ub + - .cmake_test_macos_external + - .macos_x86_64_tags_ext + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - t:macos-x86_64-ninja + needs: + - t:macos-x86_64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + +t:macos-x86_64-xcode-ub: + extends: + - .macos_x86_64_xcode_ub + - .cmake_test_macos_external + - .macos_x86_64_tags_ext + - .cmake_junit_artifacts + - .run_dependent + dependencies: + - t:macos-x86_64-ninja + needs: + - t:macos-x86_64-ninja + variables: + CMAKE_CI_JOB_NIGHTLY: "true" + b:macos-package: extends: - .macos_package diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake b/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_ninja_ub.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake b/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake new file mode 100644 index 0000000..4b5c401 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_ninja_ub.cmake @@ -0,0 +1 @@ +set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") diff --git a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake new file mode 100644 index 0000000..4b5c401 --- /dev/null +++ b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake @@ -0,0 +1 @@ +set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 9cdc8d4..0e122ab 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -80,6 +80,14 @@ CMAKE_GENERATOR: Xcode CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.macos_x86_64_xcode_ub: + extends: .macos + + variables: + CMAKE_CONFIGURATION: macos_x86_64_xcode_ub + CMAKE_GENERATOR: Xcode + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + .macos_x86_64_ninja_multi: extends: .macos @@ -88,6 +96,13 @@ CMAKE_GENERATOR: "Ninja Multi-Config" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" +.macos_x86_64_ninja_ub: + extends: .macos + + variables: + CMAKE_CONFIGURATION: macos_x86_64_ninja_ub + CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" + ## Tags .macos_x86_64_tags: |