import: fix bitbucket import

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b49592cb2afede99cbea57104d44938229f49be8..0b0a4d3e5e4562170ee85d4d3b5e4fdace523513 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,29 +6,22 @@ test:
     - 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. Ensure that the official tags are included when
+# running these tests on forks as well.
 metadata_v0:
   script:
+    - git fetch https://gitlab.com/fdroid/fdroidserver 0.8
     - 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
+    - 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 $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'
-             metadata/dump_*/*.yaml"
+    - ../tests/dump_internal_metadata_format.py
     - diff -uw metadata/dump_*