Rewrite scanner logic

[fdroidserver.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 298bf5048585c68b0f1b6cc46b0a07a6da62da53..df6e202968edf99fa02966c20dedd9b020b96b21 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,21 @@
 before_script:
   - apt-get -q update -y
-  - echo " == Installing required packages"
-  - apt-get -q install -y wget tar lib32stdc++6 lib32z1
-      python pyflakes pep8 dash bash ruby
-      python-imaging python-libcloud python-logilab-astng python-magic
+  - 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-paramiko python-pip python-pyasn1 python-pyasn1-modules
-      python-requests python-yaml
+      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
@@ -16,7 +23,9 @@ before_script:
   - export ANDROID_HOME=$PWD/android-sdk
   - export PATH="$ANDROID_HOME/tools:$PATH"
   - echo " == Installing Android SDK components"
-  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.0
+  - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.1
+  - export PATH="$ANDROID_HOME/platform-tools:$PATH"
+  - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH"
 
 test:
   script: