Make sure the dev version prefix is based on the latest tag in the repo,
authorWard Vandewege <wvandewege@veritasgenetics.com>
Thu, 29 Nov 2018 14:27:59 +0000 (09:27 -0500)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Thu, 29 Nov 2018 14:27:59 +0000 (09:27 -0500)
not the latest tag on the master branch.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

build/run-library.sh

index 8ba14949d3c0847acaaa8c2fe3671a513c7668de..b595cc8a06ee1ff8563289e7f197c00bd0fa963e 100755 (executable)
@@ -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"
 }