From f1f1a873adbdcd77dfca6126220461a3e137c4e8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Sun, 19 Feb 2023 15:48:16 +0100
Subject: [PATCH] gitlab-ci: bump RELEASE_COMMIT_ID to 2.2 beta

This avoid having to write a complicated regex for postbuild:
---
 .gitlab-ci.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96b9b59b..e20f7ddd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ metadata_v0:
   image: registry.gitlab.com/fdroid/fdroidserver:buildserver
   variables:
     GIT_DEPTH: 1000
-    RELEASE_COMMIT_ID: b987a4af5c770472f7db8958b304b28b1e6624fd  # 2.1.1
+    RELEASE_COMMIT_ID: 58cfce106b6d68dc8ebde7842cf01225f5adfd1b  # 2.2b
   script:
     - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID
     - cd tests
@@ -56,16 +56,6 @@ metadata_v0:
     - git checkout $GITCOMMIT
     - cd fdroiddata
     - ../tests/dump_internal_metadata_format.py
-    - sed -i
-          -e "s/CurrentVersionCode:.'\([0-9]*\)'/CurrentVersionCode:\1/"
-          -e "s/  versionCode:.'\([0-9]*\)'/  versionCode:\1/"
-          -e "s/  timeout:.'\([0-9]*\)'/  timeout:\1/"
-          -e "/VercodeOperation/s/null/[]/"
-          -e 's/VercodeOperation:.\([^[]\+\)/VercodeOperation:\n- \1/'
-          -e '/LiberapayID/d'
-          -e '/postbuild/d'
-          -e '/binary:/d'
-          metadata/dump_*/*.yaml
     - diff -uw metadata/dump_*
 
 .apt-template: &apt-template