Skip to content

Commit d1ee44c

Browse files
hramosdsyang
authored andcommitted
Fix Docker Android tests container issue related to the JSC (facebook#24360)
Summary: [Fixes an issue where the Docker Android tests container cannot be built.](facebook#24276 (comment)) The JSC is now pulled from the npm registry, so we need to run `yarn` prior to pulling the Gradle dependencies. [Android] [Fixed] - Fixed React Native Android tests Docker container issue related to the JSC Pull Request resolved: facebook#24360 Differential Revision: D14842534 Pulled By: hramos fbshipit-source-id: 3a1a714879e9c52a812b1077dce449470c30bddd
1 parent bbb028b commit d1ee44c

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.circleci/Dockerfiles/Dockerfile.android

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#
99
# The base image is expected to remain relatively stable, and only
1010
# needs to be updated when major dependencies such as the Android
11-
# SDK or NDK are updated.
11+
# SDK or NDK are updated.
1212
#
13-
# In this Android Test image, we download the latest dependencies
14-
# and build a Android application that can be used to run the
13+
# In this Android Test image, we download the latest dependencies
14+
# and build a Android application that can be used to run the
1515
# tests specified in the scripts/ directory.
1616
#
1717
FROM reactnativecommunity/react-native-android
@@ -42,16 +42,11 @@ RUN buck fetch ReactAndroid/src/androidTest/...
4242
RUN buck build ReactAndroid/src/main/java/com/facebook/react
4343
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
4444

45-
ADD gradle /app/gradle
46-
ADD gradlew /app/gradlew
47-
ADD settings.gradle /app/settings.gradle
48-
ADD build.gradle /app/build.gradle
49-
ADD react.gradle /app/react.gradle
45+
ADD . /app
5046

51-
RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog :ReactAndroid:downloadJSC
47+
RUN yarn
5248

53-
RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
49+
RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
5450

55-
ADD . /app
51+
RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
5652

57-
RUN yarn

0 commit comments

Comments
 (0)