Merge branch 'some-build-fixes' into 'master'

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad80ad869f27be2f7028537f46721d03442e5b5..ef1e2fbe6e6b11177f9ff539651d867da057a81a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,8 @@
-before_script:
-  - apt-get -q update -y
-  - echo " == Installing required packages"
-  - apt-get -q install -y python pyflakes pep8 dash bash ruby
-      python-imaging python-libcloud python-magic python-paramiko
-      python-pyasn1 python-pyasn1-modules python-requests
-  - 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
-  - mv android-sdk-linux android-sdk
-  - 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
-  - echo y | android -s update sdk --no-ui -a -t tools
-  - echo y | android -s update sdk --no-ui -a -t build-tools-23.0.0
+image: mvdan/fdroid-ci:server-20160613
 
 test:
   script:
-    - ./hooks/pre-commit
+    - mkdir -p /usr/lib/python3.4/site-packages/
+    - pip3 install -e .
     - cd tests
-    - ./run-tests
+    - ./complete-ci-tests