From e562c6bb36f02b8e6cf10163565cac46e013e3b6 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 13 Nov 2021 00:16:43 +0800 Subject: [PATCH 1/2] CI: bump react-native-android docker image to 5.0 --- .circleci/Dockerfiles/Dockerfile.android | 2 +- .circleci/config.yml | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android index cc31fbcea436..d9937b5f8100 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:4.0 +FROM reactnativecommunity/react-native-android:5.0 LABEL Description="React Native Android Test Image" LABEL maintainer="Héctor Ramos " diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f91a2531760..03f054611c82 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ executors: reactnativeandroid: <<: *defaults docker: - - image: reactnativecommunity/react-native-android:4.0 + - image: reactnativecommunity/react-native-android:5.0 resource_class: "large" environment: - TERM: "dumb" diff --git a/package.json b/package.json index bd407f156abe..bcab316a74ee 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "prettier": "prettier --write \"./**/*.{js,md,yml}\"", "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"", "update-lock": "npx yarn-deduplicate", - "docker-setup-android": "docker pull reactnativecommunity/react-native-android:4.0", + "docker-setup-android": "docker pull reactnativecommunity/react-native-android:5.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", From c8cf4d129a5831b42a8a30ceb518dd010a21889d Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 13 Nov 2021 00:29:59 +0800 Subject: [PATCH 2/2] remove _JAVA_OPTIONS --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 03f054611c82..4598e5473d74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,6 @@ executors: environment: - TERM: "dumb" - ADB_INSTALL_TIMEOUT: 10 - - _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError"' - BUILD_THREADS: 2 # Repeated here, as the environment key in this executor will overwrite the one in defaults