From a8eb4f70c730bc3ee3dba4d9b1ca6f70f0d674d3 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Tue, 16 Jun 2026 15:15:31 +0100 Subject: [PATCH] Unbreak android CI by moving to ubuntu-latest (#57216) Backport of #57216 to 0.86-stable. Move CI jobs off the timing-out 4-core-ubuntu / 8-core-ubuntu runners to ubuntu-latest across the Android, fantom, build and publish workflows. macOS runners are unchanged. This is the equivalent of upstream commit 097dbc288b8f803caea324ae9522f0262b300a07; applied manually because the workflow files have diverged on this branch and a direct cherry-pick conflicts. --- .github/workflows/e2e-android-rntester.yml | 2 +- .github/workflows/e2e-android-templateapp.yml | 2 +- .github/workflows/fantom-tests.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/publish-release.yml | 2 +- .github/workflows/test-all.yml | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e-android-rntester.yml b/.github/workflows/e2e-android-rntester.yml index 03970036269..b5cccaa9a5a 100644 --- a/.github/workflows/e2e-android-rntester.yml +++ b/.github/workflows/e2e-android-rntester.yml @@ -16,7 +16,7 @@ on: jobs: test: - runs-on: 4-core-ubuntu + runs-on: ubuntu-latest outputs: status: ${{ steps.report-status.outputs.status }} strategy: diff --git a/.github/workflows/e2e-android-templateapp.yml b/.github/workflows/e2e-android-templateapp.yml index 5246d6b5935..a889a52d7b4 100644 --- a/.github/workflows/e2e-android-templateapp.yml +++ b/.github/workflows/e2e-android-templateapp.yml @@ -16,7 +16,7 @@ on: jobs: test: - runs-on: 4-core-ubuntu + runs-on: ubuntu-latest outputs: status: ${{ steps.report-status.outputs.status }} strategy: diff --git a/.github/workflows/fantom-tests.yml b/.github/workflows/fantom-tests.yml index 97c8fd5c18f..e6443b4bf66 100644 --- a/.github/workflows/fantom-tests.yml +++ b/.github/workflows/fantom-tests.yml @@ -16,7 +16,7 @@ on: jobs: test: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest outputs: status: ${{ steps.report-status.outputs.status }} container: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2fde057a69d..f4b568994b9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -35,7 +35,7 @@ jobs: needs: [prebuild_apple_dependencies] build_android: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest if: github.repository == 'react/react-native' needs: [set_release_type] container: @@ -61,7 +61,7 @@ jobs: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} build_npm_package: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest needs: [ set_release_type, diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 9602eaef71c..a0729166534 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -52,7 +52,7 @@ jobs: needs: [prebuild_apple_dependencies] build_npm_package: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest needs: [ set_release_type, diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index 8e889d8ac51..948f36f0dca 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -214,7 +214,7 @@ jobs: secrets: inherit build_fantom_runner: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest needs: [set_release_type, check_code_changes, lint] if: needs.check_code_changes.outputs.any_code_change == 'true' container: @@ -257,7 +257,7 @@ jobs: secrets: inherit build_android: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest needs: [set_release_type, check_code_changes] if: | needs.check_code_changes.outputs.any_code_change == 'true' && @@ -302,7 +302,7 @@ jobs: secrets: inherit build_npm_package: - runs-on: 8-core-ubuntu + runs-on: ubuntu-latest needs: [ set_release_type, @@ -329,7 +329,7 @@ jobs: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} test_android_helloworld: - runs-on: 4-core-ubuntu + runs-on: ubuntu-latest needs: build_npm_package container: image: reactnativecommunity/react-native-android:latest