From 7e9a3c553dd14a312ab3c2c9424c00f7facd2ea3 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 27 Aug 2025 16:47:29 +0200 Subject: [PATCH 1/4] chore(ci): v7: Handle GH runner image deprecations --- .github/workflows/e2e-v2.yml | 6 +++--- .github/workflows/native-tests.yml | 2 +- .github/workflows/sample-application-expo.yml | 2 +- .github/workflows/sample-application.yml | 4 ++-- .github/workflows/testflight.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 1800090478..6362f639a0 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -173,7 +173,7 @@ jobs: - platform: ios rn-version: '0.80.2' xcode-version: '16.2' - runs-on: macos-15 + runs-on: macos-14 - platform: ios rn-version: '0.65.3' xcode-version: '14.2' @@ -310,10 +310,10 @@ jobs: include: - platform: ios rn-version: '0.80.2' - runs-on: macos-15 + runs-on: macos-14 - platform: ios rn-version: '0.65.3' - runs-on: macos-15 + runs-on: macos-14 - platform: android runs-on: ubuntu-latest exclude: diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index 9ec519d2f9..2c9cfb5c89 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -18,7 +18,7 @@ jobs: test-ios: name: ios - runs-on: macos-15 + runs-on: macos-14 needs: [diff_check] if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 5830f3e5fd..2b616ebacb 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -35,7 +35,7 @@ jobs: build-type: ['dev', 'production'] include: - platform: ios - runs-on: macos-15 + runs-on: macos-14 - platform: android runs-on: ubuntu-latest - platform: web diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index 0b08d8f6eb..35aad4389e 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -43,7 +43,7 @@ jobs: build-type: ['dev', 'production'] include: - platform: ios - runs-on: macos-15 + runs-on: macos-14 - platform: macos runs-on: macos-15 - platform: android @@ -218,7 +218,7 @@ jobs: matrix: include: - platform: ios - runs-on: macos-15 + runs-on: macos-14 rn-architecture: 'new' ios-use-frameworks: 'no-frameworks' build-type: 'production' diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml index 06bba8da11..d30cc22003 100644 --- a/.github/workflows/testflight.yml +++ b/.github/workflows/testflight.yml @@ -14,7 +14,7 @@ jobs: upload_to_testflight: name: Build and Upload React Native Sample to Testflight - runs-on: macos-15 + runs-on: macos-14 needs: [diff_check] if: ${{ needs.diff_check.outputs.skip_ci != 'true' }} steps: From b11e9e5ce4e5692885c69372d25a1955307b42c9 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 27 Aug 2025 16:55:24 +0200 Subject: [PATCH 2/4] chore(deps): v7: update Android SDK to v8.20.0 --- packages/core/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle index 68e4396811..0cc5290d84 100644 --- a/packages/core/android/build.gradle +++ b/packages/core/android/build.gradle @@ -54,5 +54,5 @@ android { dependencies { implementation 'com.facebook.react:react-native:+' - api 'io.sentry:sentry-android:8.19.0' + api 'io.sentry:sentry-android:8.20.0' } From 384defd1964b0dd4239b9e3bdef0af0e71dda5cd Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 27 Aug 2025 16:57:00 +0200 Subject: [PATCH 3/4] Adds changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 540362c035..68d0b34544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,9 @@ ### Dependencies -- Bump Android SDK from v8.17.0 to v8.19.0 ([#5034](https://github.com/getsentry/sentry-react-native/pull/5034), [#5063](https://github.com/getsentry/sentry-react-native/pull/5063)) - - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8190) - - [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.19.0) +- Bump Android SDK from v8.17.0 to v8.20.0 ([#5034](https://github.com/getsentry/sentry-react-native/pull/5034), [#5063](https://github.com/getsentry/sentry-react-native/pull/5063), [#5106](https://github.com/getsentry/sentry-react-native/pull/5106)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8200) + - [diff](https://github.com/getsentry/sentry-java/compare/8.17.0...8.20.0) ## 7.0.0-rc.1 From 3f5241fbe1312c5b2f5db90965860875fbc48634 Mon Sep 17 00:00:00 2001 From: Antonis Lilis Date: Wed, 27 Aug 2025 20:33:13 +0200 Subject: [PATCH 4/4] Set specific xcode version for expo (see https://github.com/expo/expo/issues/36830) --- .github/workflows/sample-application-expo.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml index 2b616ebacb..0dc2f45cc6 100644 --- a/.github/workflows/sample-application-expo.yml +++ b/.github/workflows/sample-application-expo.yml @@ -35,6 +35,7 @@ jobs: build-type: ['dev', 'production'] include: - platform: ios + xcode-version: '16.2' runs-on: macos-14 - platform: android runs-on: ubuntu-latest @@ -70,6 +71,9 @@ jobs: - name: Gradle cache uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0 + - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer + if: ${{ matrix.platform == 'ios' }} + - name: Setup Global Xcode Tools if: ${{ matrix.platform == 'ios' }} run: which xcbeautify || brew install xcbeautify