diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 6f20855a9c..e5e162e997 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,10 +60,7 @@ 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 + - run: corepack enable - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6 with: package-manager-cache: false @@ -72,6 +68,10 @@ jobs: cache: 'yarn' cache-dependency-path: yarn.lock + - name: Install Ninja + if: ${{ matrix.platform == 'android' }} + run: sudo apt-get update && sudo apt-get install -y ninja-build + - uses: actions/setup-java@v5 with: java-version: '17' @@ -189,15 +189,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,10 +245,7 @@ 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 + - run: corepack enable - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6 with: package-manager-cache: false @@ -258,6 +253,10 @@ jobs: cache: 'yarn' cache-dependency-path: yarn.lock + - name: Install Ninja + if: ${{ matrix.platform == 'android' }} + run: sudo apt-get update && sudo apt-get install -y ninja-build + - uses: actions/setup-java@v5 with: java-version: '17' @@ -323,9 +322,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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 @@ -354,7 +353,7 @@ jobs: path: dev-packages/e2e-tests - name: Enable Corepack - run: npm i -g corepack + run: corepack enable - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6 with: package-manager-cache: false @@ -362,6 +361,10 @@ jobs: cache: 'yarn' cache-dependency-path: yarn.lock + - name: Install Ninja + if: ${{ matrix.platform == 'android' }} + run: sudo apt-get update && sudo apt-get install -y ninja-build + - uses: actions/setup-java@v5 with: java-version: '17'