diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-19 17:54:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-02-23 16:21:59 (GMT) |
| commit | 397ced99d73aeec6271d56dd22ba8d2b715d1e7c (patch) | |
| tree | 2534b320a355e353d5dad00ed8475973d28800af /.gitlab | |
| parent | 0755c2ffbbf256f99967f9b30cdd5b4c12ee3477 (diff) | |
| download | CMake-397ced99d73aeec6271d56dd22ba8d2b715d1e7c.zip CMake-397ced99d73aeec6271d56dd22ba8d2b715d1e7c.tar.gz CMake-397ced99d73aeec6271d56dd22ba8d2b715d1e7c.tar.bz2 | |
gitlab-ci: Add macos-arm64 jobs for Ninja and Xcode
For now, leave these jobs out during merge requests.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_macos_arm64_ninja.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_arm64_xcode.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 30 |
3 files changed, 35 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_macos_arm64_ninja.cmake b/.gitlab/ci/configure_macos_arm64_ninja.cmake new file mode 100644 index 0000000..f657d98 --- /dev/null +++ b/.gitlab/ci/configure_macos_arm64_ninja.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_arm64_xcode.cmake b/.gitlab/ci/configure_macos_arm64_xcode.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_arm64_xcode.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/os-macos.yml b/.gitlab/os-macos.yml index a7f55a7..7fe6277 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -31,6 +31,13 @@ CMAKE_CONFIGURATION: macos_x86_64_ninja CTEST_NO_WARNINGS_ALLOWED: 1 +.macos_arm64_ninja: + extends: .macos_build + + variables: + CMAKE_CONFIGURATION: macos_arm64_ninja + CTEST_NO_WARNINGS_ALLOWED: 1 + .macos_x86_64_makefiles: extends: .macos_build @@ -64,6 +71,13 @@ CMAKE_CONFIGURATION: macos_x86_64_xcode CMAKE_GENERATOR: Xcode +.macos_arm64_xcode: + extends: .macos + + variables: + CMAKE_CONFIGURATION: macos_arm64_xcode + CMAKE_GENERATOR: Xcode + ## Tags .macos_x86_64_builder_tags: @@ -91,6 +105,22 @@ - xcode-12.3 - concurrent +.macos_arm64_builder_tags: + tags: + - cmake # Since this is a bare runner, pin to a project. + - macos-arm64 + - shell + - xcode-12.3 + - nonconcurrent + +.macos_arm64_builder_ext_tags: + tags: + - cmake # Since this is a bare runner, pin to a project. + - macos-arm64 + - shell + - xcode-12.3 + - concurrent + ## macOS-specific scripts .before_script_macos: &before_script_macos |