Skip to content

Commit

Permalink
Merge branch 'main' into feat/mapping-layout-props
Browse files Browse the repository at this point in the history
  • Loading branch information
@necolas
necolas committed Nov 8, 2022
2 parents 3300043 + 7a327d9 commit 2d46f00
Show file tree
Hide file tree
Showing 1,763 changed files with 52,634 additions and 43,041 deletions.
3 changes: 1 addition & 2 deletions .circleci/Dockerfiles/Dockerfile.android
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
# 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 <hector@fb.com>"

# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
ENV KOTLIN_HOME="third-party/kotlin"

ADD .buckconfig /app/.buckconfig
Expand Down
2 changes: 1 addition & 1 deletion .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ node cli.js bundle --platform android --dev true --entry-file ReactAndroid/src/a

# build test APK
# shellcheck disable=SC1091
source ./scripts/android-setup.sh && NO_BUCKD=1 retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1
source ./scripts/android-setup.sh && NO_BUCKD=1 scripts/retry3 buck install ReactAndroid/src/androidTest/buck-runner:instrumentation-tests --config build.threads=1

# run installed apk with tests
node ./.circleci/Dockerfiles/scripts/run-android-ci-instrumentation-tests.js "$*"
Expand Down
Loading

0 comments on commit 2d46f00

Please sign in to comment.