Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix android circleci #1618

Merged
merged 13 commits into from
Jun 4, 2020
Merged

Fix android circleci #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0c74048
test separating into different steps
andrepimenta Jun 4, 2020
9a042ab
Fix command
andrepimenta Jun 4, 2020
d5d4244
Trying more memory
andrepimenta Jun 4, 2020
fed0056
fix param
andrepimenta Jun 4, 2020
a80d269
other params
andrepimenta Jun 4, 2020
38db290
increasing docker memory
andrepimenta Jun 4, 2020
fd308d8
Trying setting different resource
andrepimenta Jun 4, 2020
98a0d1e
try 3g
andrepimenta Jun 4, 2020
0fe46df
Test from a circleci blog android config
andrepimenta Jun 4, 2020
cca07be
trying another config
andrepimenta Jun 4, 2020
c0d7509
Final circleci config
andrepimenta Jun 4, 2020
a0602c5
Revert package json
andrepimenta Jun 4, 2020
07f8cbc
Merge branch 'develop' into fix-android-circleci
andrepimenta Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ jobs:
publish-pre-release-android:
working_directory: ~/MetaMask
environment:
_JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms1024m -Xmx2048m"'
JAVA_OPTS: "-Xms512m -Xmx1024m"
_JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
docker:
- image: circleci/android:api-28-node8-alpha
steps:
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# org.gradle.daemon=false

AsyncStorage_db_size_in_MB=10
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ buildAndroidRelease(){
fi

# GENERATE APK
cd android && ./gradlew assembleRelease --max-workers 2
cd android && ./gradlew assembleRelease --no-daemon --max-workers 2

# GENERATE BUNDLE
if [ "$GENERATE_BUNDLE" = true ] ; then
Expand Down