mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: Move some macOS merge request jobs to arm64 hosts

Browse Source 
Over time we are adding `arm64` hosts and removing `x86_64` hosts.
Switch to using `arm64` for some of the more common jobs.
This commit is contained in:
Brad King
2023-05-08 18:07:20 -04:00
parent a2fba5967a
commit 03af1c52d6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+7 -7
View File
@@ -824,7 +824,7 @@ b:macos-x86_64-ninja:
- .macos_x86_64_tags - .macos_x86_64_tags
- .run_manually - .run_manually
variables: variables:
CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_NO_MR: "true"
b:macos-arm64-ninja: b:macos-arm64-ninja:
extends: extends:
@@ -834,7 +834,7 @@ b:macos-arm64-ninja:
- .macos_arm64_tags - .macos_arm64_tags
- .run_manually - .run_manually
variables: variables:
CMAKE_CI_NO_MR: "true" CMAKE_CI_JOB_CONTINUOUS: "true"
t:macos-x86_64-ninja: t:macos-x86_64-ninja:
extends: extends:
@@ -848,8 +848,7 @@ t:macos-x86_64-ninja:
needs: needs:
- b:macos-x86_64-ninja - b:macos-x86_64-ninja
variables: variables:
CMAKE_CI_JOB_CONTINUOUS: "true" CMAKE_CI_NO_MR: "true"
CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
t:macos-arm64-ninja: t:macos-arm64-ninja:
extends: extends:
@@ -863,7 +862,8 @@ t:macos-arm64-ninja:
needs: needs:
- b:macos-arm64-ninja - b:macos-arm64-ninja
variables: variables:
CMAKE_CI_NO_MR: "true" CMAKE_CI_JOB_CONTINUOUS: "true"
CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
b:macos-x86_64-makefiles: b:macos-x86_64-makefiles:
extends: extends:
@@ -909,6 +909,8 @@ t:macos-x86_64-xcode:
- t:macos-x86_64-ninja - t:macos-x86_64-ninja
needs: needs:
- t:macos-x86_64-ninja - t:macos-x86_64-ninja
variables:
CMAKE_CI_NO_MR: "true"
t:macos-arm64-xcode: t:macos-arm64-xcode:
extends: extends:
@@ -921,8 +923,6 @@ t:macos-arm64-xcode:
- t:macos-arm64-ninja - t:macos-arm64-ninja
needs: needs:
- t:macos-arm64-ninja - t:macos-arm64-ninja
variables:
CMAKE_CI_NO_MR: "true"
t:macos-x86_64-ninja-ub: t:macos-x86_64-ninja-ub:
extends: extends: