scanner: rename variables, use os.path.relpath

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d4fc950e107086b6c4f2dc8a938bc2add5aae60..6ce9064e37f70e86ddc45ab9d6faa9b47d7534d3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,25 @@
-image: registry.gitlab.com/fdroid/ci-images:server-latest
+image: registry.gitlab.com/fdroid/ci-images-server:latest
 
 test:
   script:
-    - mkdir -p /usr/lib/python3.4/site-packages/
-    # workaround https://github.com/pypa/setuptools/issues/937
-    - pip3 install setuptools==33.1.1
     - pip3 install -e .
     - cd tests
     - ./complete-ci-tests
 
-# Test that the parsing of the .txt format didn't change. The metadata
-# field 'Author Web Site' was added after 0.7.0, so that can't be part
-# of the test.
+# Test that the parsing of the .txt format didn't change 
+# from last released version.
 metadata_v0:
   script:
     - cd tests
-    - cp dump_internal_metadata_format.py dump.py # since this isn't in old commits
-    - git checkout 0.7.0  # or any old commit of your choosing
+    - export GITCOMMIT=`git describe`
+    - git checkout 0.8  # bump after release
     - 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
-    - ../tests/dump.py
+    - ../tests/dump_internal_metadata_format.py
     - cd ..
     - git reset --hard
-    - git checkout master
+    - git checkout $GITCOMMIT
     - cd fdroiddata
-    - ../tests/dump.py
-    - sed -i -e "/AuthorWebSite/d"
-             -e "/Description: No description available/d"
-             -e "/Description: ''/d"
-             metadata/dump_*/*.yaml
+    - ../tests/dump_internal_metadata_format.py
     - diff -uw metadata/dump_*