Weblate

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 381df6708e2c3cc731ed4a61dc371163124a077d..948cf678306d7afde31d1dd77ba0b9d097e1ecbf 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,15 +7,21 @@ test:
     - ./complete-ci-tests
 
 # Test that the parsing of the .txt format didn't change from last
-# released version. Ensure that the official tags are included when
-# running these tests on forks as well.
+# released version. This uses the commit ID of the release tags,
+# rather than the release tag itself so that contributor forks do not
+# need to include the tags in them for this test to work.
+#
+# The COMMIT_ID should be bumped after each release, so that the list
+# of sed hacks needed does not continuously grow.
 metadata_v0:
   image: registry.gitlab.com/fdroid/ci-images-server:latest
+  variables:
+    RELEASE_COMMIT_ID: 2f563f533b3571c80f7a09c6fbb453398658f723  # 1.0.2
   script:
-    - git fetch https://gitlab.com/fdroid/fdroidserver 0.8
+    - git fetch https://gitlab.com/fdroid/fdroidserver $RELEASE_COMMIT_ID
     - cd tests
     - export GITCOMMIT=`git describe`
-    - git checkout 0.8  # bump after release
+    - git checkout $RELEASE_COMMIT_ID
     - cd ..
     - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata
     - cd fdroiddata
@@ -25,7 +31,10 @@ metadata_v0:
     - git checkout $GITCOMMIT
     - cd fdroiddata
     - ../tests/dump_internal_metadata_format.py
-    - sed -i -e '/LiberapayID/d'
+    - sed -i
+          -e '/Translation:/d'
+          -e '/kivy:\sfalse/d'
+          -e '/timeout:\s/d'
           metadata/dump_*/*.yaml
     - diff -uw metadata/dump_*
 
@@ -34,39 +43,33 @@ debian_testing:
   only:
     - master@fdroid/fdroidserver
   script:
-    - apt update -y
-    - apt dist-upgrade -y
-    - apt-get install -y --no-install-recommends
-        aapt adb android-platform-tools-base android-sdk-common fdroidserver
-        git gnupg python3-setuptools zipalign
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install --no-install-recommends
+        fdroidserver git gnupg python3-setuptools
+    - sed -i -e 's,testing,sid,g' -e  's,testing,sid,g' /etc/apt/sources.list
+    - apt-get -qy update
+    - apt-get install -y --no-install-recommends aapt androguard android-platform-tools-base 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' tests/repo/index.xml
-    - sed -i '/^diff -uw .*index-v1.json$/d' tests/run-tests
     - ./run-tests
 
+# test using LTS set up with the PPA, including Recommends
 ubuntu_lts:
   image: ubuntu:latest
   only:
     - master@fdroid/fdroidserver
   script:
-    - apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151
+    - while ! apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151; do sleep 15; done
     - export RELEASE=`sed -n 's,^deb [^ ][^ ]* \([a-z]*\).*,\1,p' /etc/apt/sources.list | head -1`
     - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list
-    - apt update -y
-    - apt dist-upgrade -y
-    - apt-get install -y --no-install-recommends
-        aapt adb android-platform-tools-base android-sdk-common fdroidserver
-        git gnupg python3-setuptools unzip wget zipalign
+    - apt-get -qy update
+    - apt-get -qy dist-upgrade
+    - apt-get -qy install fdroidserver git python3-setuptools
     - export ANDROID_HOME=/usr/lib/android-sdk
-    # xenial's aapt is too old
-    - wget --no-verbose https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip
-    - unzip -q build-tools_r27.0.1-linux.zip
-    - rm build-tools_r27.0.1-linux.zip
-    - mv android-8.1.0 $ANDROID_HOME/build-tools/27.0.1
     - export LANG=C.UTF-8
     - cd tests
     - ./run-tests
@@ -105,6 +108,7 @@ fedora_latest:
     - wget --no-verbose -O tools.zip https://dl.google.com/android/repository/tools_r25.2.4-linux.zip
     - unzip -q tools.zip
     - rm tools.zip
+    - export AAPT_VERSION=`sed -n "s,^MINIMUM_AAPT_VERSION\s*=\s*['\"]\(.*\)[['\"],\1,p" fdroidserver/common.py`
     - export ANDROID_HOME=`pwd`/android-sdk
     - mkdir $ANDROID_HOME
     - mv tools $ANDROID_HOME/
@@ -115,7 +119,7 @@ fedora_latest:
     - mkdir ~/.android
     - touch ~/.android/repositories.cfg
     - echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools"
-    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
+    - echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;$AAPT_VERSION"
     - chown -R testuser .
     - cd tests
     - su testuser --login --command