From c633b21f6cb80c38f09f2b073e2db4dfe5058b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 1 Sep 2015 15:20:24 -0700
Subject: [PATCH] CI: Split up package installing

Advantages:
* Easier to tell why we need each package
* apt-get install output is less scary/huge
* CI job is split in more, smaller steps easier to debug
---
 .gitlab-ci.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffb98018..2bf64415 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,21 @@
 before_script:
   - apt-get -q update -y
-  - echo " == Installing required packages"
-  - apt-get -q install -y wget tar lib32stdc++6 lib32z1
-      libjpeg-dev python-dev zlib1g-dev
-      python pyflakes pylint pep8 dash bash ruby
+  - echo " == Installing packages required by this CI script"
+  - apt-get -q install -y wget tar
+  - echo " == Installing packages required by fdroidserver"
+  - apt-get -q install -y python
       python-git python-imaging python-libcloud python-logilab-astng python-magic
       python-paramiko python-pip python-pyasn1 python-pyasn1-modules
       python-requests python-virtualenv python-yaml
       rsync
+  - echo " == Installing packages required by the test suite"
+  - apt-get -q install -y pyflakes pylint pep8 dash bash ruby
+  - echo " == Installing packages required to build Pillow"
+  - apt-get -q install -y python-dev libjpeg-dev zlib1g-dev
   - echo " == Installing OpenJDK 7"
   - apt-get -q install -y openjdk-7-jdk
+  - echo " == Installing packages required by the 32-bit SDK"
+  - apt-get -q install -y lib32stdc++6 lib32z1
   - echo " == Installing the Android SDK"
   - wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
   - tar -x -z -f android-sdk.tgz