mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-04 22:40:12 +01:00
Merge branch 'fix_git_describe' into 'master'
Use git rev-parse instead of describe See merge request fdroid/fdroidserver!1427
This commit is contained in:
commit
79bb763986
@ -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
|
||||
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user