From d3abb74c888720a1d55e084308212a43c6bc6788 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Tue, 9 Jan 2024 13:15:23 +0100 Subject: [PATCH 1/2] Use git rev-parse instead of describe We only want the hash. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b867e2b7..cc32f148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ metadata_v0: script: - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID - cd tests - - export GITCOMMIT=`git describe` + - export GITCOMMIT=$(git rev-parse HEAD) - git checkout $RELEASE_COMMIT_ID - cd .. - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git From 0849e664e7033d291be27742decb3a78355b334e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 9 Jan 2024 14:54:38 +0100 Subject: [PATCH 2/2] metadata_v0: use `git rev-parse` instead of `git describe` --- tests/dump_internal_metadata_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dump_internal_metadata_format.py b/tests/dump_internal_metadata_format.py index 5dade52b..24b7e911 100755 --- a/tests/dump_internal_metadata_format.py +++ b/tests/dump_internal_metadata_format.py @@ -65,7 +65,7 @@ if not os.path.isdir('metadata'): sys.exit(1) repo = git.Repo(localmodule) -savedir = os.path.join('metadata', 'dump_' + repo.git.describe()) +savedir = os.path.join('metadata', 'dump_' + repo.git.rev_parse('HEAD')) if not os.path.isdir(savedir): os.mkdir(savedir)