diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-08 22:07:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-05-09 18:33:04 (GMT) |
| commit | 03af1c52d6e817ea490705f711977f9ee716caa5 (patch) | |
| tree | fd60606c4fe08f830811e8dbedf66820e01b79dd /.gitlab-ci.yml | |
| parent | a2fba5967a1fd32dd75681c375fc7ea122f2cb38 (diff) | |
| download | CMake-03af1c52d6e817ea490705f711977f9ee716caa5.zip CMake-03af1c52d6e817ea490705f711977f9ee716caa5.tar.gz CMake-03af1c52d6e817ea490705f711977f9ee716caa5.tar.bz2 | |
gitlab-ci: Move some macOS merge request jobs to arm64 hosts
Over time we are adding `arm64` hosts and removing `x86_64` hosts.
Switch to using `arm64` for some of the more common jobs.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a41406..19629c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -824,7 +824,7 @@ b:macos-x86_64-ninja: - .macos_x86_64_tags - .run_manually variables: - CMAKE_CI_JOB_CONTINUOUS: "true" + CMAKE_CI_NO_MR: "true" b:macos-arm64-ninja: extends: @@ -834,7 +834,7 @@ b:macos-arm64-ninja: - .macos_arm64_tags - .run_manually variables: - CMAKE_CI_NO_MR: "true" + CMAKE_CI_JOB_CONTINUOUS: "true" t:macos-x86_64-ninja: extends: @@ -848,8 +848,7 @@ t:macos-x86_64-ninja: needs: - b:macos-x86_64-ninja variables: - CMAKE_CI_JOB_CONTINUOUS: "true" - CMAKE_CI_JOB_NIGHTLY_NINJA: "true" + CMAKE_CI_NO_MR: "true" t:macos-arm64-ninja: extends: @@ -863,7 +862,8 @@ t:macos-arm64-ninja: needs: - b:macos-arm64-ninja variables: - CMAKE_CI_NO_MR: "true" + CMAKE_CI_JOB_CONTINUOUS: "true" + CMAKE_CI_JOB_NIGHTLY_NINJA: "true" b:macos-x86_64-makefiles: extends: @@ -909,6 +909,8 @@ t:macos-x86_64-xcode: - t:macos-x86_64-ninja needs: - t:macos-x86_64-ninja + variables: + CMAKE_CI_NO_MR: "true" t:macos-arm64-xcode: extends: @@ -921,8 +923,6 @@ t:macos-arm64-xcode: - t:macos-arm64-ninja needs: - t:macos-arm64-ninja - variables: - CMAKE_CI_NO_MR: "true" t:macos-x86_64-ninja-ub: extends: |