diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-10 13:41:17 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-10 09:41:26 -0400 |
| commit | 25eddc2ef3a5ced7851b1c3795a46ac3364c18f1 (patch) | |
| tree | f344551b450668e36e9d568e7f0aa1cefb84259a | |
| parent | 8383f44370d9aa72611a9537cd6be9209f2c71ed (diff) | |
| parent | 03af1c52d6e817ea490705f711977f9ee716caa5 (diff) | |
| download | cmake-25eddc2ef3a5ced7851b1c3795a46ac3364c18f1.tar.gz | |
Merge topic 'ci-macos-archs'
03af1c52d6 gitlab-ci: Move some macOS merge request jobs to arm64 hosts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8465
| -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 0c405a735b..700e436b75 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: |