Skip to content

Commit 2049278

Browse files
committed
Unbreak android CI by moving to ubuntu-latest (#57216)
Backport of #57216 to 0.85-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 097dbc2; applied manually because the workflow files have diverged on this branch and a direct cherry-pick conflicts.
1 parent 6efe8cd commit 2049278

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
needs: [prebuild_apple_dependencies]
3535

3636
build_android:
37-
runs-on: 8-core-ubuntu
37+
runs-on: ubuntu-latest
3838
if: github.repository == 'react/react-native'
3939
needs: [set_release_type]
4040
container:
@@ -60,7 +60,7 @@ jobs:
6060
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
6161

6262
build_npm_package:
63-
runs-on: 8-core-ubuntu
63+
runs-on: ubuntu-latest
6464
needs:
6565
[
6666
set_release_type,

.github/workflows/publish-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
needs: [prebuild_apple_dependencies]
5353

5454
build_npm_package:
55-
runs-on: 8-core-ubuntu
55+
runs-on: ubuntu-latest
5656
needs:
5757
[
5858
set_release_type,

.github/workflows/test-all.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
working-directory: /tmp/RNTestProject
270270

271271
test_e2e_android_templateapp:
272-
runs-on: 4-core-ubuntu
272+
runs-on: ubuntu-latest
273273
needs: build_npm_package
274274
strategy:
275275
fail-fast: false
@@ -337,7 +337,7 @@ jobs:
337337
working-directory: /tmp/RNTestProject
338338

339339
run_fantom_tests:
340-
runs-on: 8-core-ubuntu
340+
runs-on: ubuntu-latest
341341
needs: [set_release_type, check_code_changes, lint]
342342
if: needs.check_code_changes.outputs.any_code_change == 'true'
343343
container:
@@ -361,7 +361,7 @@ jobs:
361361
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
362362

363363
build_android:
364-
runs-on: 8-core-ubuntu
364+
runs-on: ubuntu-latest
365365
needs: [set_release_type, check_code_changes]
366366
if: |
367367
needs.check_code_changes.outputs.any_code_change == 'true' &&
@@ -387,7 +387,7 @@ jobs:
387387
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
388388

389389
test_e2e_android_rntester:
390-
runs-on: 4-core-ubuntu
390+
runs-on: ubuntu-latest
391391
needs: [build_android]
392392
strategy:
393393
fail-fast: false
@@ -417,7 +417,7 @@ jobs:
417417
flavor: ${{ matrix.flavor }}
418418

419419
build_npm_package:
420-
runs-on: 8-core-ubuntu
420+
runs-on: ubuntu-latest
421421
needs:
422422
[
423423
set_release_type,
@@ -444,7 +444,7 @@ jobs:
444444
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
445445

446446
test_android_helloworld:
447-
runs-on: 4-core-ubuntu
447+
runs-on: ubuntu-latest
448448
needs: build_npm_package
449449
container:
450450
image: reactnativecommunity/react-native-android:latest

.github/workflows/test-hermes-v1-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
test-hermes-v1-android:
1414
name: Test Hermes V1 on Android
15-
runs-on: 4-core-ubuntu
15+
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
1818
flavor: [debug, release]

0 commit comments

Comments
 (0)