mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix_git_describe' into 'master'

Browse source 
Use git rev-parse instead of describe

See merge request fdroid/fdroidserver!1427
This commit is contained in:
Hans-Christoph Steiner 2024-01-09 14:04:26 +00:00
commit 79bb763986
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -46,7 +46,7 @@ metadata_v0:
script: script:
- git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID
- cd tests - cd tests
- export GITCOMMIT=`git describe` - export GITCOMMIT=$(git rev-parse HEAD)
- git checkout $RELEASE_COMMIT_ID - git checkout $RELEASE_COMMIT_ID
- cd .. - cd ..
- git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git - git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git

2
tests/dump_internal_metadata_format.py
View file

@ -65,7 +65,7 @@ if not os.path.isdir('metadata'):
sys.exit(1) sys.exit(1)
repo = git.Repo(localmodule) 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): if not os.path.isdir(savedir):
os.mkdir(savedir) os.mkdir(savedir)