Merge branch 'revert-af707cd1' into 'master'

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b49592cb2afede99cbea57104d44938229f49be8..7e17d7c88beff927fcca31ea102b040d8715c328 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,8 @@ test:
     - ./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.
+# 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
@@ -19,6 +19,10 @@ metadata_v0:
     - 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
@@ -30,5 +34,6 @@ metadata_v0:
              -e \"/Description: ''/d\"
              -e '/antifeatures:/d'
              -e '/buildozer:/d'
+             -e '/sudo:/d'
              metadata/dump_*/*.yaml"
     - diff -uw metadata/dump_*