From 9106fb1321651de2df0e9cd5557d4b0bbdc885c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 3 Sep 2015 17:04:30 -0700
Subject: [PATCH] CI: Run build and connectedCheck in the root

This will make sure that all projects in the repository are built and tested.
Should come in handy for !126, which splits up the app into two apps and one
library.
---
 .gitlab-ci.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c7e7e3d..95025e391 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,15 +25,14 @@ before_script:
 
 test:
   script:
-    - cd F-Droid
     - echo " == Building via gradle"
-    - gradle clean assemble
+    - gradle build
     - echo " == Setting up Android 2.3.7 emulator"
     - echo no | android create avd --force -n fcl-test -t android-10 -b armeabi
     - echo " == Starting Android 2.3.7 emulator"
     - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
-    - ./tools/wait-for-emulator
+    - ./F-Droid/tools/wait-for-emulator
     - echo " == Running Android tests"
-    - gradle connectedAndroidTest
+    - gradle connectedCheck
     - echo " == Stopping Android 2.3.7 emulator"
     - kill $!