diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e173f9a6..239f43bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: @@ -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 @@ -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 diff --git a/tests/impl/core/platform/system_info_test.cpp b/tests/impl/core/platform/system_info_test.cpp index 74b41039..a7eb26c5 100644 --- a/tests/impl/core/platform/system_info_test.cpp +++ b/tests/impl/core/platform/system_info_test.cpp @@ -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,". 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)