From 4eb37b0d335d800dcbc775eea45ef252b3c64876 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 1 Apr 2017 15:27:38 +0200
Subject: [PATCH] pull in .gitlab-ci.yml from master to get connected24 working
again
---
.gitlab-ci.yml | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bacbb3648..54486423f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: fdroid/ci:client-20161023
+image: registry.gitlab.com/fdroid/ci-images:client
cache:
paths:
@@ -7,13 +7,21 @@ cache:
before_script:
- export GRADLE_USER_HOME=$PWD/.gradle
+ - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
+ - echo y | android --silent update sdk --no-ui --filter android-${ANDROID_COMPILE_SDK}
test:
script:
+ - cd app
+ - ./tools/langs-list-check.py
+ - ./tools/check-string-format.py
+ - cd ..
- ./gradlew assemble -PdisablePreDex
# always report on lint errors to the build log
- sed -i -e 's,textReport .*,textReport true,' app/build.gradle
- ./gradlew lint -PdisablePreDex
+ - ./gradlew pmd -PdisablePreDex
+ - ./gradlew checkstyle -PdisablePreDex
- ./gradlew test -PdisablePreDex || {
for log in app/build/reports/*ests/*/*ml; do
echo "read $log here:";
@@ -26,6 +34,7 @@ connected10:
variables:
AVD_SDK: "10"
script:
+ - ./gradlew assembleDebug -PdisablePreDex
- emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
- ./tools/wait-for-emulator
- adb shell input keyevent 82 &
@@ -47,7 +56,8 @@ connected24:
variables:
AVD_SDK: "24"
script:
- - emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
+ - ./gradlew assembleDebug -PdisablePreDex
+ - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
- ./tools/wait-for-emulator
- adb shell input keyevent 82 &
- export EXITVALUE=0
@@ -64,24 +74,6 @@ connected24:
done
- exit $EXITVALUE
-pmd:
- script:
- - ./gradlew pmd -PdisablePreDex
-
-checkstyle:
- script:
- - ./gradlew checkstyle -PdisablePreDex
-
-tools:
- before_script:
- - echo "ignored, no gradle needed"
- script:
- - cd app
- - ./tools/langs-list-check.py
- - ./tools/check-string-format.py
- after_script:
- - echo "ignored, no gradle needed"
-
after_script:
# this file changes every time but should not be cached
- rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock