Skip to content
Snippets Groups Projects
Commit 4df335eb authored by akwizgran's avatar akwizgran
Browse files

Merge branch 'own-ci' into 'master'

Switch to our own CI image

See merge request akwizgran/briar!809
parents f31219d5 682bee14
No related merge requests found
image: registry.gitlab.com/fdroid/ci-images-base:latest image: briar/ci-image-android:latest
cache: test:
paths: before_script:
- .gradle/wrapper - set -e
- .gradle/caches - export GRADLE_USER_HOME=$PWD/.gradle
before_script: cache:
- set -e paths:
- export GRADLE_USER_HOME=$PWD/.gradle - .gradle/wrapper
- .gradle/caches
test:
script: script:
- ./gradlew --no-daemon animalSnifferMain animalSnifferTest - ./gradlew --no-daemon animalSnifferMain animalSnifferTest
- ./gradlew --no-daemon test - ./gradlew --no-daemon test
...@@ -19,12 +19,13 @@ test: ...@@ -19,12 +19,13 @@ test:
- rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
- rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/ - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
test_reproducible: test_reproducible:
image: briar/reproducer:latest image: briar/reproducer:latest
script: script:
- cd .. && mv briar /opt/briar-reproducer/
- cd /opt/briar-reproducer - cd /opt/briar-reproducer
- ./reproduce.py ${CI_COMMIT_REF_NAME} - ./reproduce.py ${CI_COMMIT_REF_NAME}
only: only:
- tags - tags
...@@ -256,11 +256,13 @@ android { ...@@ -256,11 +256,13 @@ android {
resValue "string", "app_name", "Briar Debug" resValue "string", "app_name", "Briar Debug"
shrinkResources false shrinkResources false
minifyEnabled true minifyEnabled true
crunchPngs false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
release { release {
shrinkResources true shrinkResources true
minifyEnabled true minifyEnabled true
crunchPngs false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
} }
} }
...@@ -276,10 +278,6 @@ android { ...@@ -276,10 +278,6 @@ android {
} }
} }
aaptOptions {
cruncherEnabled = false
}
lintOptions { lintOptions {
warning 'MissingTranslation' warning 'MissingTranslation'
warning 'ImpliedQuantity' warning 'ImpliedQuantity'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment