From 2c7489508f13c9ebdde617ba0c78617fd55809ba Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 17 Mar 2017 12:29:45 +0100
Subject: [PATCH 1/3] gitlab-ci: ensure compile platform is installed

Avoid broken builds when fdroidclient gets out of sync with
ci-images/client.

`emulator -no-skin` no longer does anything, but give a warning.
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6ce6a091..7d8a715e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ 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:
@@ -53,7 +55,7 @@ connected24:
   variables:
     AVD_SDK: "24"
   script:
-    - emulator64-arm -avd fcl-test-$AVD_SDK -no-skin -no-audio -no-window &
+    - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &
     - export EXITVALUE=0

From e69c04458fed2ffc67ab4afe0e81be8c994dc1d2 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 17 Mar 2017 12:42:59 +0100
Subject: [PATCH 2/3] gitlab-ci: build before starting emulator to speed things
 up

The emulator will grab a bunch of RAM, so run assemble before
connectedCheck so that the app is mostly built before starting the
emulator.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d8a715e3..c9647a6db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,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 &
@@ -55,6 +56,7 @@ connected24:
   variables:
     AVD_SDK: "24"
   script:
+    - ./gradlew assembleDebug -PdisablePreDex
     - emulator64-arm -avd fcl-test-$AVD_SDK -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82 &

From 655030d1b62fc604da0d2624159175bdce1d64c5 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 17 Mar 2017 14:02:38 +0100
Subject: [PATCH 3/3] gitlab-ci: require connected24 check now that its fixed

* new docker image: ci-images/client
* switched back to ARM emulator, now that gitlab doesn't allow KVM
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9647a6db..54486423f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,6 @@ connected24:
         cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
       done
     - exit $EXITVALUE
-  allow_failure: true
 
 after_script:
     # this file changes every time but should not be cached