From ff48e70fd7cc41997a27c0b04bb38149a6abfa0d Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 29 Nov 2018 09:27:59 -0500 Subject: [PATCH] Make sure the dev version prefix is based on the latest tag in the repo, not the latest tag on the master branch. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/run-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/run-library.sh b/build/run-library.sh index 8ba14949d3..b595cc8a06 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -60,7 +60,7 @@ version_from_git() { fi declare $(format_last_commit_here "git_ts=%ct git_hash=%h") - ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)" + ARVADOS_BUILDING_VERSION="$(git tag -l |sort -V -r |head -n1).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)" echo "$ARVADOS_BUILDING_VERSION" } -- 2.39.5