From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 16 Feb 2018 13:25:47 +0000 (+0100)
Subject: gitlab-ci: switch debian_testing to use androguard
X-Git-Tag: 1.0.1~2^2~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9f553186e8d24559ab8a9ce2745c041fc094dac4;p=fdroidserver.git

gitlab-ci: switch debian_testing to use androguard
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1705910f..c315e1ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,15 +46,13 @@ debian_testing:
     - apt update -y
     - apt dist-upgrade -y
     - apt-get install -y --no-install-recommends
-        aapt adb android-platform-tools-base android-sdk-common fdroidserver
+        aapt adb androguard android-platform-tools-base android-sdk-common fdroidserver
         git gnupg python3-setuptools zipalign
+    - python3 -c 'import fdroidserver'
+    - python3 -c 'import androguard'
     - export ANDROID_HOME=/usr/lib/android-sdk
     - export LANG=C.UTF-8
     - cd tests
-    - rm -f install.TestCase  # fails frequently and is unimportant
-    - echo "Debian's build-tools is too old, remove once the package has been updated"
-    - sed -i '/android.permission.READ_EXTERNAL_STORAGE/d' repo/index.xml
-    - sed -i '/^diff -uw .*index-v1.json$/d' run-tests
     - ./run-tests
 
 ubuntu_lts: