From 93edc35d9462981f0a7aa2e6cf79919e8aecd655 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhu Date: Feb 28 2019 02:57:15 +0000 Subject: Use all tags (including unannotated tags) to generate version number By default `git describe` generates version numbers only using annotated tags. --- diff --git a/version.sh b/version.sh index f063aee..6b29bdb 100644 --- a/version.sh +++ b/version.sh @@ -10,7 +10,7 @@ if [ "$(git tag | wc -l)" -eq 0 ] ; then lastversion="0.0" revbase="" else - lasttag="$(git describe --abbrev=0 HEAD)" + lasttag="$(git describe --tags --abbrev=0 HEAD)" lastversion="${lasttag##${name}-}" revbase="^$lasttag" fi @@ -36,4 +36,3 @@ export WAIVERDB_VERSION=$version export WAIVERDB_RPM_VERSION=$rpmver export WAIVERDB_RPM_RELEASE=$rpmrel export WAIVERDB_CONTAINER_VERSION=${version/+/-} -