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] [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