From adc8c0501492b7502c4e649c2173c3784d65229d Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 25 Nov 2018 13:00:45 +0100
Subject: [PATCH 1/3] [CI] Docker image now has gradle cache for faster CI

---
 .gitlab-ci.yml | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43643ef9b..106072ed2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,25 +3,12 @@ image: hatsoftwares/mastalab-ci:latest
 before_script:
   - export ANDROID_HOME=/opt/android-sdk-linux
   - export PATH=$PATH:/opt/android-sdk-linux/platform-tools/
-  - export GRADLE_USER_HOME=$(pwd)/.gradle/
   - chmod +x gradlew
 
 stages:
-  - prepare
   - build
   - test
 
-prepare:
-  stage: prepare
-  script:
-    - ./gradlew tasks
-  cache:
-      key: "$CI_COMMIT_SHA"
-      paths:
-        - app/build/outputs/
-        - .gradle/
-      policy: push
-
 assembleDebug:
   stage: build
   script:
@@ -30,7 +17,7 @@ assembleDebug:
     key: "$CI_COMMIT_SHA"
     paths:
       - app/build/outputs/
-      - .gradle/
+    policy: push
 
 lintDebug:
   stage: test
@@ -38,10 +25,9 @@ lintDebug:
     key: "$CI_COMMIT_SHA"
     paths:
       - app/build/outputs/
-      - .gradle/
     policy: pull
   script:
-    - ./gradlew --stacktrace -Pci --console=plain :app:lintFdroidDebug -PbuildDir=lint
+    - ./gradlew -Pci --console=plain :app:lintFdroidDebug -PbuildDir=lint
 
 debugTests:
   stage: test
@@ -49,7 +35,6 @@ debugTests:
     key: "$CI_COMMIT_SHA"
     paths:
       - app/build/outputs/
-      - .gradle/
     policy: pull
   script:
-    - ./gradlew --stacktrace -Pci --console=plain :app:testFdroidDebugUnitTest
+    - ./gradlew -Pci --console=plain :app:testFdroidDebugUnitTest

From 3e8e8c47c8402736fc877d345c5a1c9b9b6045ae Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 25 Nov 2018 13:05:01 +0100
Subject: [PATCH 2/3] [CI] Add CI Docker stuff

Once you have login in docker, just run `cd .ci-docker/ && make` to
build and publish the CI docker image
---
 .ci-docker/Dockerfile | 26 ++++++++++++++++++++++++++
 .ci-docker/Makefile   |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 .ci-docker/Dockerfile
 create mode 100644 .ci-docker/Makefile

diff --git a/.ci-docker/Dockerfile b/.ci-docker/Dockerfile
new file mode 100644
index 000000000..99186e197
--- /dev/null
+++ b/.ci-docker/Dockerfile
@@ -0,0 +1,26 @@
+FROM openjdk:8-jdk
+RUN apt-get -y update
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y apt-utils
+RUN DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget tar unzip lib32stdc++6 lib32z1 git
+
+ENV ANDROID_COMPILE_SDK "28"
+ENV ANDROID_BUILD_TOOLS "28.0.3"
+ENV ANDROID_SDK_TOOLS "4333796"
+
+WORKDIR /opt/
+RUN wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
+RUN unzip -q -d android-sdk-linux android-sdk.zip
+RUN echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
+RUN echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
+RUN echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+RUN yes | android-sdk-linux/tools/bin/sdkmanager --licenses
+
+WORKDIR /tmp/
+RUN git clone --depth=1 https://gitlab.com/tom79/mastalab
+WORKDIR /tmp/mastalab
+RUN chmod +x gradlew
+RUN ANDROID_HOME=/opt/android-sdk-linux PATH=$PATH:/opt/android-sdk-linux/platform-tools/ ./gradlew tasks
+RUN ANDROID_HOME=/opt/android-sdk-linux PATH=$PATH:/opt/android-sdk-linux/platform-tools/ ./gradlew assembleDebug
+RUN ANDROID_HOME=/opt/android-sdk-linux PATH=$PATH:/opt/android-sdk-linux/platform-tools/ ./gradlew --stacktrace -Pci --console=plain :app:testFdroidDebugUnitTest
+RUN ANDROID_HOME=/opt/android-sdk-linux PATH=$PATH:/opt/android-sdk-linux/platform-tools/ ./gradlew --stacktrace -Pci --console=plain :app:lintFdroidDebug -PbuildDir=lint
diff --git a/.ci-docker/Makefile b/.ci-docker/Makefile
new file mode 100644
index 000000000..fbaf6453b
--- /dev/null
+++ b/.ci-docker/Makefile
@@ -0,0 +1,2 @@
+all:
+	docker build -t tom79/mastalab-ci:latest . && docker push tom79/mastalab-ci:latest

From e26e18a8d4a5c568e204b03c0f13b978f2a7d34d Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 25 Nov 2018 13:34:53 +0100
Subject: [PATCH 3/3] [CI] Parallelize all jobs

---
 .gitlab-ci.yml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 106072ed2..942510385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,35 +6,20 @@ before_script:
   - chmod +x gradlew
 
 stages:
-  - build
+  - build-and-test
   - test
 
 assembleDebug:
-  stage: build
+  stage: build-and-test
   script:
     - ./gradlew assembleDebug
-  cache:
-    key: "$CI_COMMIT_SHA"
-    paths:
-      - app/build/outputs/
-    policy: push
 
 lintDebug:
-  stage: test
-  cache:
-    key: "$CI_COMMIT_SHA"
-    paths:
-      - app/build/outputs/
-    policy: pull
+  stage: build-and-test
   script:
     - ./gradlew -Pci --console=plain :app:lintFdroidDebug -PbuildDir=lint
 
 debugTests:
-  stage: test
-  cache:
-    key: "$CI_COMMIT_SHA"
-    paths:
-      - app/build/outputs/
-    policy: pull
+  stage: build-and-test
   script:
     - ./gradlew -Pci --console=plain :app:testFdroidDebugUnitTest