From c5901e5e14a0c931523d9d43510fd5a378f8de6e Mon Sep 17 00:00:00 2001
From: Alexander Pantiukhov <alex@apantiukhov.com>
Date: Mon, 15 Dec 2025 10:40:43 +0100
Subject: [PATCH 1/2] Bump e2e tests and sample apps to XCode 26

Trying it with Cirrus Labs

Native tests

Fix

Small fix

Fixes

Fix

Test fixes

Fixes

Fix

Fix

Fixes

Roll back sample app changes

Exclude x86_64

Native tests update

Podfiles

Rolling back samples changes

e2e

Ruby version update
---
 .github/workflows/e2e-v2.yml       | 26 +++++++++++++++-----------
 .github/workflows/native-tests.yml |  4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml
index 4c8cf7bce2..6b9c445ab5 100644
--- a/.github/workflows/e2e-v2.yml
+++ b/.github/workflows/e2e-v2.yml
@@ -16,7 +16,7 @@ concurrency:
 env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
   MAESTRO_VERSION: '2.0.10'
-  IOS_DEVICE: 'iPhone 16'
+  IOS_DEVICE: 'iPhone 17'
   IOS_VERSION: '>=18.0'
 
 jobs:
@@ -47,7 +47,7 @@ jobs:
         platform: ["ios", "android"]
         include:
           - platform: ios
-            runs-on: macos-15
+            runs-on: macos-26
             name: iOS
             appPlain: performance-tests/test-app-plain.ipa
           - platform: android
@@ -61,7 +61,7 @@ jobs:
       - uses: ./.github/actions/disk-cleanup
         if: ${{ matrix.platform == 'android' }}
 
-      - run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
+      - run: sudo xcode-select -s /Applications/Xcode_26.1.1.app/Contents/Developer
         if: ${{ matrix.platform == 'ios' }}
 
       - run: npm i -g corepack
@@ -186,9 +186,16 @@ jobs:
         ios-use-frameworks: ['no', 'static', 'dynamic']
         engine: ['hermes', 'jsc']
         include:
+          # Use Xcode 16 for older RN versions
           - platform: ios
+            rn-version: '0.71.19'
             xcode-version: '16.4'
             runs-on: macos-15
+          # 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
           - platform: android
             runs-on: ubuntu-latest
         exclude:
@@ -270,16 +277,13 @@ jobs:
       - name: Install JS Dependencies
         run: yarn install
 
-      - name: Setup Plain RN ${{ matrix.rn-version }} App
-        run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --create
-
       - uses: ruby/setup-ruby@v1
         if: ${{ matrix.platform == 'ios' }}
         with:
-          working-directory: dev-packages/e2e-tests/react-native-versions/${{ matrix.rn-version }}/RnDiffApp
-          ruby-version: '3.3.0' # based on what is used in the sample
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-          cache-version: 1 # cache the installed gems
+          ruby-version: '3.3.0'
+
+      - name: Setup Plain RN ${{ matrix.rn-version }} App
+        run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --create
 
       - name: Build Plain RN ${{ matrix.rn-version }} App
         run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --build
@@ -319,7 +323,7 @@ jobs:
         include:
           - platform: ios
             rn-version: '0.83.0'
-            runs-on: macos-15
+            runs-on: macos-26
           - platform: android
             runs-on: ubuntu-latest
 
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
index a09f68649e..cab0b9257b 100644
--- a/.github/workflows/native-tests.yml
+++ b/.github/workflows/native-tests.yml
@@ -27,7 +27,7 @@ jobs:
 
   test-ios:
     name: ios
-    runs-on: macos-15
+    runs-on: macos-26
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -54,7 +54,7 @@ jobs:
         env:
           SCHEME: RNSentryCocoaTester
           CONFIGURATION: Release
-          DESTINATION: 'platform=iOS Simulator,OS=latest,name=iPhone 16'
+          DESTINATION: 'platform=iOS Simulator,OS=latest,name=iPhone 17'
         run: |
           env NSUnbufferedIO=YES \
             xcodebuild -workspace *.xcworkspace \

From 8d1c4e62ed284e2be81a2454a90c5c8cfa4df8a2 Mon Sep 17 00:00:00 2001
From: Alexander Pantiukhov <alex@apantiukhov.com>
Date: Wed, 17 Dec 2025 11:36:13 +0100
Subject: [PATCH 2/2] Fix

---
 .github/workflows/native-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
index cab0b9257b..a09f68649e 100644
--- a/.github/workflows/native-tests.yml
+++ b/.github/workflows/native-tests.yml
@@ -27,7 +27,7 @@ jobs:
 
   test-ios:
     name: ios
-    runs-on: macos-26
+    runs-on: macos-15
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -54,7 +54,7 @@ jobs:
         env:
           SCHEME: RNSentryCocoaTester
           CONFIGURATION: Release
-          DESTINATION: 'platform=iOS Simulator,OS=latest,name=iPhone 17'
+          DESTINATION: 'platform=iOS Simulator,OS=latest,name=iPhone 16'
         run: |
           env NSUnbufferedIO=YES \
             xcodebuild -workspace *.xcworkspace \