makefile: allow matching two digit major versions

Signed-off-by: John Mulligan <jmulligan@redhat.com> (cherry picked from commit 11487fc)
heketi · Jul 21, 2020 · 7a6610d · 7a6610d
1 parent 10176a2
commit 7a6610d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -6,8 +6,8 @@ APP_NAME := heketi
 CLIENT_PKG_NAME := heketi-client
 SHA := $(shell git rev-parse --short HEAD)
 BRANCH := $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
-VER := $(shell git describe --match='v[0-9].[0-9].[0-9]')
-TAG := $(shell git tag --points-at HEAD 'v[0-9].[0-9].[0-9]' | tail -n1)
+VER := $(shell git describe --match='v[0-9]*.[0-9].[0-9]')
+TAG := $(shell git tag --points-at HEAD 'v[0-9]*.[0-9].[0-9]' | tail -n1)
 GO:=go
 GLIDE:=glide --debug
 TESTBIN:=./test.sh

diff --git a/client/cli/go/Makefile b/client/cli/go/Makefile
@@ -8,7 +8,7 @@ APP_NAME := heketi-cli
 SHA := $(shell git rev-parse --short HEAD)
 BRANCH := $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
 VER := $(shell git describe)
-TAG := $(shell git tag --points-at HEAD 'v[0-9].[0-9].[0-9]' | tail -n1)
+TAG := $(shell git tag --points-at HEAD 'v[0-9]*.[0-9].[0-9]' | tail -n1)
 GO:=go
 GOARCH := $(shell $(GO) env GOARCH)
 GOOS := $(shell $(GO) env GOOS)