From 5a0dab1bcfdd459dd4701e245748bac32bb7199c Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Tue, 18 Aug 2026 10:23:40 +0100 Subject: [PATCH 1/2] Migrate test jobs to macOS Sequoia ARM64 runners --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36485cb44..b42a16611 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ stages: # TESTS test:lint: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -55,7 +55,7 @@ test:lint: - yarn run lint test:js: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -66,7 +66,7 @@ test:js: - NODE_OPTIONS='-r dd-trace/ci/init' DD_ENV=ci DD_SERVICE=dd-sdk-reactnative yarn test test:build: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -76,7 +76,7 @@ test:build: - yarn prepare test:native-android: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -94,7 +94,7 @@ test:native-android: - (cd packages/internal-testing-tools/android && ./gradlew build -PDdSdkReactNative_minSdkVersion=24 -PDatadogInternalTesting_minSdkVersion=24) test:native-ios: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -102,10 +102,10 @@ test:native-ios: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify test:native-ios-sr: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -113,10 +113,10 @@ test:native-ios-sr: script: - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify test:native-ios-newarch: - tags: ['macos:sonoma', 'specific:true'] + tags: ['macos:sequoia-arm64', 'specific:true'] stage: test rules: - if: '$BUILD_BENCHMARK != "true"' @@ -124,7 +124,7 @@ test:native-ios-newarch: script: - yarn - (cd example-new-architecture/ios && RCT_NEW_ARCH_ENABLED=1 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify benchmark: stage: benchmark From 31613a9855ebe04b8d3be39d4926b8a82207d061 Mon Sep 17 00:00:00 2001 From: "carlos.nogueira" Date: Tue, 18 Aug 2026 10:45:39 +0100 Subject: [PATCH 2/2] Run native iOS tests with Xcode 26.5 --- .gitlab-ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b42a16611..8d2aba050 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ include: variables: GIT_DEPTH: 5 DEVELOP_BRANCH: 'develop' + XCODE_VERSION: '26.5' ANDROID_SDK_VERSION: 'commandlinetools-mac-11076708_latest' EMULATOR_NAME: 'android_emulator' ANDROID_ARCH: 'arm64-v8a' @@ -22,6 +23,9 @@ stages: - notify .snippets: + select-xcode: + - sudo xcodes select "$XCODE_VERSION" + - xcodebuild -version install-jdk-17: - brew install openjdk@17 install-android-sdk: @@ -100,9 +104,10 @@ test:native-ios: - if: '$BUILD_BENCHMARK != "true"' timeout: 1h script: + - !reference [.snippets, select-xcode] - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=26.5,name=iPhone 17 Pro" | xcbeautify test:native-ios-sr: tags: ['macos:sequoia-arm64', 'specific:true'] @@ -111,9 +116,10 @@ test:native-ios-sr: - if: '$BUILD_BENCHMARK != "true"' timeout: 1h script: + - !reference [.snippets, select-xcode] - yarn - (cd example/ios && RCT_NEW_ARCH_ENABLED=0 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNativeSessionReplay test -destination "platform=iOS Simulator,OS=26.5,name=iPhone 17 Pro" | xcbeautify test:native-ios-newarch: tags: ['macos:sequoia-arm64', 'specific:true'] @@ -122,9 +128,10 @@ test:native-ios-newarch: - if: '$BUILD_BENCHMARK != "true"' timeout: 1h script: + - !reference [.snippets, select-xcode] - yarn - (cd example-new-architecture/ios && RCT_NEW_ARCH_ENABLED=1 pod install --repo-update) - - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=18.5,name=iPhone 16 Pro Max" | xcbeautify + - set -o pipefail && xcodebuild -workspace example-new-architecture/ios/DdSdkReactNativeExample.xcworkspace -scheme DatadogSDKReactNative test -destination "platform=iOS Simulator,OS=26.5,name=iPhone 17 Pro" | xcbeautify benchmark: stage: benchmark