Skip to content

Commit 4721b85

Browse files
committed
hack: handle prefixed version formats in gen-ver.sh
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent bae8240 commit 4721b85

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

hack/scripts/gen-ver.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ version=$(git -C "${srcdir}" describe --match 'v[0-9]*' --always --tags)
2424
commit="$(git --git-dir "${srcdir}/.git" rev-parse HEAD)"
2525
commitShort=${commit:0:7}
2626

27+
# Handle prefixed version formats
28+
# cmd/cli/v0.1.44 -> v0.1.44
29+
if [[ "$version" =~ .*/v[0-9] ]]; then
30+
version="${version##*/}"
31+
fi
32+
# docker-v29.0.0 -> v29.0.0
33+
if [[ "$version" =~ ^docker-v[0-9] ]]; then
34+
version="${version#docker-}"
35+
fi
36+
2737
# rpm "Release:" field ($rpmRelease) is used to set the "_release" macro, which
2838
# is an incremental number for builds of the same release (Version: / #rpmVersion).
2939
#

0 commit comments

Comments
 (0)