From e2397d0328cb176cd5239b79cbce64f922fd5dee Mon Sep 17 00:00:00 2001 From: Alexander Pantiukhov Date: Thu, 18 Dec 2025 11:30:50 +0100 Subject: [PATCH 1/3] e2e tests on Cirrus Labs runners --- .github/workflows/e2e-v2.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 6b9c445ab5..0b7fbb4fcd 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -47,12 +47,11 @@ jobs: platform: ["ios", "android"] include: - platform: ios - runs-on: macos-26 + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] name: iOS appPlain: performance-tests/test-app-plain.ipa - platform: android - # Not using the latest version due to a known issue: https://github.com/getsentry/sentry-react-native/issues/4418 - runs-on: ubuntu-22.04 + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] name: Android appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk steps: @@ -61,9 +60,6 @@ jobs: - uses: ./.github/actions/disk-cleanup if: ${{ matrix.platform == 'android' }} - - run: sudo xcode-select -s /Applications/Xcode_26.1.1.app/Contents/Developer - if: ${{ matrix.platform == 'ios' }} - - run: npm i -g corepack - uses: actions/setup-node@v6 with: @@ -189,15 +185,13 @@ jobs: # Use Xcode 16 for older RN versions - platform: ios rn-version: '0.71.19' - xcode-version: '16.4' - runs-on: macos-15 + runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"] # Use Xcode 26 for newer RN versions (0.83.0) - platform: ios rn-version: '0.83.0' - xcode-version: '26.1.1' - runs-on: macos-26 + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] - platform: android - runs-on: ubuntu-latest + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] exclude: # exclude JSC for new RN versions (keeping the matrix manageable) - rn-version: '0.83.0' @@ -247,9 +241,6 @@ jobs: echo "SENTRY_RELEASE=$SENTRY_RELEASE" echo "SENTRY_DIST=$SENTRY_DIST" - - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer - if: ${{ matrix.platform == 'ios' }} - - run: npm i -g corepack - uses: actions/setup-node@v6 with: @@ -323,9 +314,9 @@ jobs: include: - platform: ios rn-version: '0.83.0' - runs-on: macos-26 + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] - platform: android - runs-on: ubuntu-latest + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] steps: - uses: actions/checkout@v6 From a04f35189b875c04be0b51b194cd96b186e157be Mon Sep 17 00:00:00 2001 From: Alexander Pantiukhov Date: Thu, 18 Dec 2025 14:08:40 +0100 Subject: [PATCH 2/3] Checking another group --- .github/workflows/e2e-v2.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 0b7fbb4fcd..0e784206bd 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -47,11 +47,11 @@ jobs: platform: ["ios", "android"] include: - platform: ios - runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:10"] name: iOS appPlain: performance-tests/test-app-plain.ipa - platform: android - runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"] name: Android appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk steps: @@ -185,13 +185,13 @@ jobs: # Use Xcode 16 for older RN versions - platform: ios rn-version: '0.71.19' - runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"] + runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"] # Use Xcode 26 for newer RN versions (0.83.0) - platform: ios rn-version: '0.83.0' - runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:10"] - platform: android - runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"] exclude: # exclude JSC for new RN versions (keeping the matrix manageable) - rn-version: '0.83.0' From 83a3d6a7cf0ffa9dd66365332670590dc31c8b90 Mon Sep 17 00:00:00 2001 From: Alexander Pantiukhov Date: Thu, 18 Dec 2025 14:17:18 +0100 Subject: [PATCH 3/3] rolling back last change --- .github/workflows/e2e-v2.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 0e784206bd..0b7fbb4fcd 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -47,11 +47,11 @@ jobs: platform: ["ios", "android"] include: - platform: ios - runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:10"] + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] name: iOS appPlain: performance-tests/test-app-plain.ipa - platform: android - runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"] + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] name: Android appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk steps: @@ -185,13 +185,13 @@ jobs: # Use Xcode 16 for older RN versions - platform: ios rn-version: '0.71.19' - runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:10"] + runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"] # Use Xcode 26 for newer RN versions (0.83.0) - platform: ios rn-version: '0.83.0' - runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:10"] + runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2", "runner_group_id:12"] - platform: android - runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:10"] + runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"] exclude: # exclude JSC for new RN versions (keeping the matrix manageable) - rn-version: '0.83.0'