Skip to content

ci: migrate macOS jobs to tart VM runner #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alee1246 wants to merge 3 commits into
base: develop
Choose a base branch
from
+11 −5
Draft

ci: migrate macOS jobs to tart VM runner #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
913c03f
ci: migrate macOS jobs to tart VM runner
alee1246 Jul 8, 2026
22a4eb3
test: match VirtualMac model on tart VMs; drop tart-VM tag comments
alee1246 Jul 8, 2026
92bceb1
ci: initialize pyenv so python is available on tart VM
alee1246 Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ build-linux:
build-macos:
stage: build
dependencies: []
tags: [macos:sonoma, specific:true] # Use AMI dd-sdk-cpp-sonoma, w/ Xcode 15.3.0, AppleClang 15
tags: [macos:tart]
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-cpp-sonoma-latest"
parallel:
# Ensure that all targets build on macOS
matrix:
Expand Down Expand Up @@ -229,8 +230,11 @@ build-macos:
test-macos:
stage: build
dependencies: []
tags: [macos:sonoma, specific:true] # Use AMI dd-sdk-cpp-sonoma
tags: [macos:tart]
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-cpp-sonoma-latest"
script:
- export PYENV_ROOT="$HOME/.pyenv"
- export PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
- python -m venv .venv && .venv/bin/python -m pip install -e '.[integration-test]'
- >
cmake
Expand Down Expand Up @@ -321,7 +325,8 @@ package-linux:
package-macos:
stage: package
dependencies: []
tags: [macos:sonoma, specific:true] # Use AMI dd-sdk-cpp-sonoma, w/ Xcode 15.3.0, AppleClang 15
tags: [macos:tart]
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-sdk-cpp-sonoma-latest"
parallel:
matrix:
# macos-{arch}-clang-libc++-shared-release
Expand Down
5 changes: 3 additions & 2 deletions tests/impl/core/platform/system_info_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,10 @@ TEST_CASE("SystemInfo", "[unit][platform-system-info]") {
// And the brand is "Apple"
REQUIRE(device_info.brand == "Apple");

// And the model starts with "Mac" (if not empty)
// And the model starts with "VirtualMac" (if not empty); CI runs in
// Apple Virtualization VMs, which report hw.model as "VirtualMac<N>,<M>".
if (!device_info.model.empty()) {
REQUIRE(device_info.model.find("Mac") == 0);
REQUIRE(device_info.model.find("VirtualMac") == 0);
}

// And the name is an alphabetical prefix of the model (if both are present)
Expand Down