From 1b8c1e11a8713f4cc4b4d8188c9133eaca9f33c9 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 3 Jun 2021 11:58:43 -0400 Subject: [PATCH] Tweak version-at-commit.sh for interim releases (X.Y.Z.A) Assign correct intended dev version when there is a X.Y.Z.A tag (not just X.Y.Z) in the history. refs #17512 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- version-at-commit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version-at-commit.sh b/version-at-commit.sh index 53687daf..fc60d53e 100755 --- a/version-at-commit.sh +++ b/version-at-commit.sh @@ -37,12 +37,12 @@ else merge_base=$(git merge-base origin/master "$commit") if git merge-base --is-ancestor "$nearest_tag" "$merge_base" ; then - # x.(y+1).0.devTIMESTAMP, where x.y.z is the newest version that does not contain $commit + # x.(y+1).0~devTIMESTAMP, where x.y.z is the newest version that does not contain $commit # grep reads the list of tags (-f) that contain $commit and filters them out (-v) # this prevents a newer tag from retroactively changing the versions of everything before it - v=$(git tag | grep -vFf <(git tag --contains "$commit") | sort -Vr | head -n1 | perl -pe 's/\.(\d+)\.\d+/".".($1+1).".0"/e') + v=$(git tag | grep -vFf <(git tag --contains "$commit") | sort -Vr | head -n1 | perl -pe 's/(\d+)\.(\d+)\.\d+.*/"$1.".($2+1).".0"/e') else - # x.y.(z+1).devTIMESTAMP, where x.y.z is the latest released ancestor of $commit + # x.y.(z+1)~devTIMESTAMP, where x.y.z is the latest released ancestor of $commit v=$(echo $nearest_tag | perl -pe 's/(\d+)$/$1+1/e') fi isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit") -- 2.30.2