Merge branch 'revert-af707cd1' into 'master'

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ad80ad869f27be2f7028537f46721d03442e5b5..7e17d7c88beff927fcca31ea102b040d8715c328 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,39 @@
-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: registry.gitlab.com/fdroid/ci-images-server:latest
 
 test:
   script:
-    - ./hooks/pre-commit
+    - pip3 install -e .
     - cd tests
-    - ./run-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_*