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 13:22:17 -04:00
parent 86c44d507a
commit c78b42552e
2 changed files with 24 additions and 43 deletions
+6 -6
View File
@@ -1050,7 +1050,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
- .run_dependent
needs:
@@ -1074,7 +1074,7 @@ t:macos-arm64-xcode:
extends:
- .macos_arm64_xcode
- .cmake_test_macos_external
- .macos_arm64_tags_ext
- .macos_arm64_tags
- .cmake_junit_artifacts
- .run_dependent
needs:
@@ -1084,7 +1084,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
- .run_dependent
needs:
@@ -1108,7 +1108,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
- .run_dependent
needs:
@@ -1121,7 +1121,7 @@ b:macos-package:
- .macos_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_arm64_tags_package
- .macos_arm64_tags
- .run_only_for_package
needs:
- p:doc-package
@@ -1140,7 +1140,7 @@ b:macos10.10-package:
- .macos10.10_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_arm64_tags_package
- .macos_arm64_tags
- .run_only_for_package
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.4.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
@@ -63,7 +63,7 @@
CMAKE_CI_BUILD_DIR: "real_work/work/build"
.macos_arm64_curl:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos_arm64_curl
@@ -84,7 +84,7 @@
CMAKE_GENERATOR: "Unix Makefiles"
.macos_package:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos_package
@@ -92,7 +92,7 @@
CMAKE_CI_NO_INSTALL: 1
.macos10.10_package:
extends: .macos_arm64_build
extends: .macos_tart_build
variables:
CMAKE_CONFIGURATION: macos10.10_package
@@ -110,7 +110,7 @@
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode
@@ -118,7 +118,7 @@
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_xcode_symlinked:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_xcode_symlinked
@@ -128,7 +128,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
@@ -136,7 +136,7 @@
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.macos_arm64_ninja_multi:
extends: .macos_arm64
extends: .macos_tart
variables:
CMAKE_CONFIGURATION: macos_arm64_ninja_multi
@@ -154,7 +154,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
@@ -170,28 +170,9 @@
.macos_arm64_tags:
tags:
- cmake # Since this is a bare runner, pin to a project.
- cmake
- macos-arm64
- shell
- xcode-26.4
- nonconcurrent
.macos_arm64_tags_ext:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-26.4
- concurrent
.macos_arm64_tags_package:
tags:
- cmake # Since this is a bare runner, pin to a project.
- macos-arm64
- shell
- xcode-26.4
- nonconcurrent
- finder
- tart
## macOS-specific scripts