From 8b8a5e06ce68ff75efaf767208ad100e6ea75324 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 25 Oct 2022 13:20:03 -0700 Subject: [PATCH] Bump the Android Docker image to 6.0 (for NDK 23) (#35079) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/35079 This bumps the Docker image for React Native Android to 6.0 shipping the NDK 23 with it, finalizing all the work needed to support NDK 23. Changelog: [Internal] [Changed] - Bump the Android Docker image to 6.0 (for NDK 23) Reviewed By: cipolleschi Differential Revision: D40675449 fbshipit-source-id: 5fb53080ce796263cd592dbc489743e6295060ba --- .circleci/Dockerfiles/Dockerfile.android | 2 +- .circleci/config.yml | 10 +--------- package.json | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android index 74e062c88cc..ab2752fdac9 100644 --- a/.circleci/Dockerfiles/Dockerfile.android +++ b/.circleci/Dockerfiles/Dockerfile.android @@ -14,7 +14,7 @@ # and build a Android application that can be used to run the # tests specified in the scripts/ directory. # -FROM reactnativecommunity/react-native-android:5.4 +FROM reactnativecommunity/react-native-android:6.0 LABEL Description="React Native Android Test Image" LABEL maintainer="Héctor Ramos " diff --git a/.circleci/config.yml b/.circleci/config.yml index e45bc414d7d..b3ee733c859 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,7 +102,7 @@ executors: reactnativeandroid: <<: *defaults docker: - - image: reactnativecommunity/react-native-android:5.4 + - image: reactnativecommunity/react-native-android:6.0 resource_class: "xlarge" environment: - TERM: "dumb" @@ -669,10 +669,6 @@ jobs: buck build ReactAndroid/src/main/java/com/facebook/react buck build ReactAndroid/src/main/java/com/facebook/react/shell - - run: - name: Validate Android Test Environment - command: ./scripts/validate-android-test-env.sh - - run: name: Run Tests - Android Unit Tests with Buck command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml @@ -718,10 +714,6 @@ jobs: - setup_artifacts - run_yarn - - run: - name: Validate Android SDK Install - command: ./scripts/validate-android-sdk.sh - # Starting emulator in advance as it takes some time to boot. - run: name: Create Android Virtual Device diff --git a/package.json b/package.json index 4115a071bc4..c0c3eb4cd0d 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"", "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"", "update-lock": "npx yarn-deduplicate", - "docker-setup-android": "docker pull reactnativecommunity/react-native-android:5.2", + "docker-setup-android": "docker pull reactnativecommunity/react-native-android:6.0", "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .", "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh", "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",