Merge branch 'revert-af707cd1' into 'master'

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e2470bd3595f6ea3ee622ed56dbc10d7e0df5d3..7e17d7c88beff927fcca31ea102b040d8715c328 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,39 @@
-before_script:
-  - apt-get -q update -y
-  - 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-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
-  - test -z "$ANDROID_HOME" &&
-        echo " == Installing Android SDK" &&
-        apt-get -q install -y lib32stdc++6 lib32z1 &&
-        wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz &&
-        tar -xzf android-sdk.tgz &&
-        export ANDROID_HOME=$PWD/android-sdk-linux &&
-        export PATH="$ANDROID_HOME/tools:$PATH" &&
-        echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2 &&
-        export PATH="$ANDROID_HOME/platform-tools:$PATH" &&
-        export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH" &&
-        echo y | android -s update sdk --no-ui -a -t android-10
+image: registry.gitlab.com/fdroid/ci-images-server:latest
 
 test:
   script:
+    - pip3 install -e .
     - cd tests
     - ./complete-ci-tests
+
+# Test that the parsing of the .txt format didn't change. The metadata
+# fields 'Author Web Site', 'antifeatures=', 'buildozer=', and 'sudo='
+# where added after 0.7.0, so that can't be part of the test.
+metadata_v0:
+  script:
+    - cd tests
+    - cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
+    - export GITCOMMIT=`git describe`
+    - git checkout 0.7.0  # or any old commit of your choosing
+    - cd ..
+    - sed -i "s/'Author Email',/'Author Email',\n'Author Web Site',/" fdroidserver/metadata.py
+    - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata
+    - cd fdroiddata
+    - sed -i -e '/antifeatures=/d'
+             -e '/buildozer=/d'
+             -e '/sudo=/d'
+             metadata/*.txt
+    - ../tests/dump.py
+    - cd ..
+    - git reset --hard
+    - git checkout $GITCOMMIT
+    - cd fdroiddata
+    - ../tests/dump.py
+    - "sed -i -e '/AuthorWebSite/d'
+             -e '/Description: No description available/d'
+             -e \"/Description: ''/d\"
+             -e '/antifeatures:/d'
+             -e '/buildozer:/d'
+             -e '/sudo:/d'
+             metadata/dump_*/*.yaml"
+    - diff -uw metadata/dump_*