Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix Circle CI (#727) 

* remove memory limit from gradle properties to fix circle ci

* Update CircleCI config for new build flavor

* update circleCI config

* update Circle Ci config

* try no daemon gradle tests
This commit is contained in:
Konrad Pozniak 2018-08-12 20:22:37 +02:00 committed by GitHub
parent aa64a879f1
commit 44b1afc71f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.circleci/config.yml
View File

@ -25,7 +25,7 @@ jobs:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }} key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
- run: - run:
name: Run Tests name: Run Tests
command: ./gradlew test command: ./gradlew --no-daemon test
- store_artifacts: - store_artifacts:
path: app/build/reports path: app/build/reports
destination: reports destination: reports
@ -37,6 +37,7 @@ jobs:
- image: circleci/android:api-27-alpha - image: circleci/android:api-27-alpha
environment: environment:
JVM_OPTS: -Xmx3200m JVM_OPTS: -Xmx3200m
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx3200m -XX:+HeapDumpOnOutOfMemoryError"'
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -44,13 +45,13 @@ jobs:
- run: - run:
name: Build apk name: Build apk
command: | command: |
./gradlew assembleRelease --no-daemon --stacktrace ./gradlew assembleBlueRelease --no-daemon --stacktrace
/opt/android/sdk/build-tools/27.0.3/zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app-release-aligned.apk /opt/android/sdk/build-tools/27.0.3/zipalign -v -p 4 app/build/outputs/apk/blue/release/app-blue-release-unsigned.apk app-blue-release-aligned.apk
keytool -genkey -v -keystore debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -dname "C=US, O=Android, CN=Android Debug" keytool -genkey -v -keystore debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -dname "C=US, O=Android, CN=Android Debug"
/opt/android/sdk/build-tools/27.0.3/apksigner sign --ks debug.keystore --out app-release.apk --ks-pass pass:android app-release-aligned.apk /opt/android/sdk/build-tools/27.0.3/apksigner sign --ks debug.keystore --out app-blue-release.apk --ks-pass pass:android app-blue-release-aligned.apk
- store_artifacts: - store_artifacts:
path: app-release.apk path: app-blue-release.apk
destination: app-release.apk destination: app-blue-release.apk
workflows: workflows:
version: 2 version: 2
test-and-build: test-and-build:

2
gradle.properties
View File

@ -9,7 +9,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4096m # org.gradle.jvmargs=-Xmx4096m
# use parallel execution # use parallel execution
org.gradle.parallel=true org.gradle.parallel=true