gitlab-ci: move macOS nonconcurrent jobs to tart runners

`tart` uses VMs to execute jobs instead of running directly on the host.
Leave `macos-x86_64` `concurrent` jobs as `shell` runners so that there
is still testing on actual Intel hardware.
This commit is contained in:
Ben Boeckel
2026-07-19 23:28:13 -04:00
parent 7d45cbf240
commit ccb23d2864
2 changed files with 25 additions and 44 deletions
+7 -7
View File
@@ -1266,7 +1266,7 @@ t:macos-arm64-ninja-multi:
extends:
- .macos_arm64_ninja_multi
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .rules
needs:
@@ -1290,7 +1290,7 @@ t:macos-arm64-xcode:
extends:
- .macos_arm64_xcode
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .rules
needs:
@@ -1300,7 +1300,7 @@ t:macos-arm64-fastbuild:
extends:
- .macos_arm64_fastbuild
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .rules
needs:
@@ -1312,7 +1312,7 @@ t:macos-arm64-xcode-symlinked:
extends:
- .macos_arm64_xcode_symlinked
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .rules
needs:
@@ -1336,7 +1336,7 @@ t:macos-arm64-xcode-ub:
extends:
- .macos_arm64_xcode_ub
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .rules
needs:
@@ -1349,7 +1349,7 @@ b:macos-package:
- .macos_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_arm64_tags_package
- .macos_arm64_tags
- .rules
needs:
- p:doc-package
@@ -1384,7 +1384,7 @@ b:macos10.10-package:
- .macos10.10_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_arm64_tags_package
- .macos_arm64_tags
- .rules
needs:
- p:doc-package
+18 -37
View File
@@ -6,10 +6,11 @@
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci ext/$CI_CONCURRENT_ID"
.macos_arm64:
extends: .macos
.macos_tart:
image: "registry.hub.docker.com/kitware/macos-ci-images:macos-26-xcode-26.6-20260710"
variables:
DEVELOPER_DIR: "/Applications/Xcode-26.5.app/Contents/Developer"
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci"
TART_EXECUTOR_HOST_DIR: "false"
.macos_x86_64:
extends: .macos
@@ -27,10 +28,9 @@
# could run at the same time, so we drop it.
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
.macos_arm64_build:
.macos_tart_build:
extends:
- .macos_arm64
- .macos_build
- .macos_tart
.macos_x86_64_build:
extends:
@@ -46,7 +46,7 @@
CTEST_NO_WARNINGS_ALLOWED: 1
.macos_arm64_ninja:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos_arm64_ninja
@@ -54,7 +54,7 @@
CTEST_NO_WARNINGS_ALLOWED: 1
.macos_arm64_ninja_symlinked:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos_arm64_ninja_symlinked
@@ -77,7 +77,7 @@
CMAKE_GENERATOR: "Unix Makefiles"
.macos_package:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos_package
@@ -85,7 +85,7 @@
CMAKE_CI_NO_INSTALL: 1
.macos10.10_package:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos10.10_package
@@ -108,7 +108,7 @@
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode
@@ -116,7 +116,7 @@
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode_symlinked:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode_symlinked
@@ -126,7 +126,7 @@
CMAKE_CI_BUILD_DIR: "real_work/work/build"
.macos_arm64_xcode_ub:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode_ub
@@ -134,7 +134,7 @@
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_ninja_multi:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_ninja_multi
@@ -149,7 +149,7 @@
CMAKE_CI_JOB_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_fastbuild:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_fastbuild
@@ -160,7 +160,7 @@
.macos_x86_64_tags:
tags:
- cmake # Since this is a bare runner, pin to a project.
- cmake
- macos-x86_64
- shell
- xcode-26.3
@@ -176,28 +176,9 @@
.macos_arm64_tags:
tags:
- cmake # Since this is a bare runner, pin to a project.
- cmake
- macos-arm64
- shell
- xcode-26.5
- nonconcurrent
.macos_arm64_tags_ext:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-26.5
- concurrent
.macos_arm64_tags_package:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-26.5
- nonconcurrent
- finder
- tart
.macos_sign_tags:
tags: