Skip to content

Commit aeb5ed6

Browse files
committed
Try it with macos-26
1 parent 98888b5 commit aeb5ed6

File tree

3 files changed

+3
-43
lines changed

3 files changed

+3
-43
lines changed

.github/workflows/e2e-v2.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,6 @@ jobs:
8686
with:
8787
ruby-version: '3.3.0'
8888

89-
- name: Install Xcode Components
90-
if: ${{ matrix.platform == 'ios' }}
91-
# Xcode 26 on CI runners may be missing some components (MetalToolchain, Swift compatibility libraries)
92-
# This fixes linker errors like "swiftCompatibility56 not found"
93-
# See: https://github.com/actions/runner-images/issues/13080
94-
run: |
95-
sudo xcodebuild -downloadComponent MetalToolchain || true
96-
sudo xcodebuild -runFirstLaunch || true
97-
9889
- name: Install Global Dependencies
9990
run: npm i -g react-native-cli @sentry/cli
10091

@@ -292,15 +283,6 @@ jobs:
292283
if: ${{ matrix.platform == 'ios' }}
293284
run: which xcbeautify || brew install xcbeautify
294285

295-
- name: Install Xcode Components
296-
if: ${{ matrix.platform == 'ios' }}
297-
# Xcode 26 on CI runners may be missing some components (MetalToolchain, Swift compatibility libraries)
298-
# This fixes linker errors like "swiftCompatibility56 not found"
299-
# See: https://github.com/actions/runner-images/issues/13080
300-
run: |
301-
sudo xcodebuild -downloadComponent MetalToolchain || true
302-
sudo xcodebuild -runFirstLaunch || true
303-
304286
- name: Install JS Dependencies
305287
run: yarn install
306288

.github/workflows/testflight.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
upload_to_testflight:
1616
name: Build and Upload React Native Sample to Testflight
17-
runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
17+
runs-on: macos-26
1818
needs: [diff_check]
1919
if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
2020
steps:
@@ -25,7 +25,7 @@ jobs:
2525
ruby-version: '3.3.0' # based on what is used in the sample
2626
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
2727
cache-version: 1 # cache the installed gems
28-
- run: corepack enable
28+
- run: npm i -g corepack
2929
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
3030
with:
3131
package-manager-cache: false
@@ -45,14 +45,6 @@ jobs:
4545
working-directory: samples/react-native
4646
run: yarn set-build-number ${{ github.run_number }}
4747

48-
- name: Install Xcode Components
49-
# Xcode 26 on CI runners may be missing some components (MetalToolchain, Swift compatibility libraries)
50-
# This fixes linker errors like "swiftCompatibility56 not found"
51-
# See: https://github.com/actions/runner-images/issues/13080
52-
run: |
53-
sudo xcodebuild -downloadComponent MetalToolchain || true
54-
sudo xcodebuild -runFirstLaunch || true
55-
5648
- name: Pod Install
5749
working-directory: samples/react-native/ios
5850
run: PRODUCTION=1 bundle exec pod install

dev-packages/e2e-tests/patch-scripts/rn.patch.podfile.js

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,8 @@ if (currentMatch) {
6363
debug.log('Warning: Could not find platform :ios line to patch');
6464
}
6565

66-
// Add Sentry source dependency to build from source for Xcode 26+ compatibility
67-
// The prebuilt XCFramework from CocoaPods was built with Xcode 16 and contains
68-
// Swift compatibility libraries that don't exist in Xcode 26
69-
// NOTE: Keep this version in sync with packages/core/RNSentry.podspec
70-
const sentryCocoaVersion = '9.4.1';
71-
const sentrySourceDep = ` # Build Sentry from source to support Xcode 26+\n pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '${sentryCocoaVersion}'\n`;
72-
const targetPattern = /(target\s+['"][^'"]+['"]\s+do\s*\n)/;
73-
let addedSentryDep = false;
74-
if (!content.includes("pod 'Sentry', :git =>")) {
75-
content = content.replace(targetPattern, `$1${sentrySourceDep}`);
76-
addedSentryDep = true;
77-
debug.log('Added Sentry source dependency for Xcode 26+ compatibility');
78-
}
79-
8066
// Write the file if any changes were made
81-
if (shouldPatch || currentMatch || addedSentryDep) {
67+
if (shouldPatch || currentMatch) {
8268
fs.writeFileSync(args['pod-file'], content);
8369
debug.log('Podfile patched successfully!');
8470
} else {

0 commit comments

Comments
 (0)