From 1d156ab19d1b5fb0602fc7cae5348d201c93bd65 Mon Sep 17 00:00:00 2001 From: mmetc <92726601+mmetc@users.noreply.github.com> Date: Tue, 15 Feb 2022 11:09:58 +0100 Subject: [PATCH] git tag detection fix (#1265) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2f5556a71..6a6b516fc 100644 --- a/Makefile +++ b/Makefile @@ -37,10 +37,10 @@ GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' - GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2) MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1 MINIMUM_SUPPORTED_GO_MINOR_VERSION = 17 -GO_VERSION_VALIDATION_ERR_MSG = Golang version ($(BUILD_GOVERSION)) is not supported, please use least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION) +GO_VERSION_VALIDATION_ERR_MSG = Golang version ($(BUILD_GOVERSION)) is not supported, please use at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION) # Current versioning information from env -BUILD_VERSION ?= "$(shell git describe --tags `git rev-list --tags --max-count=1`)" +BUILD_VERSION ?= "$(shell git describe --tags)" BUILD_GOVERSION = "$(shell go version | cut -d " " -f3 | sed -E 's/[go]+//g')" BUILD_CODENAME = $(shell cat RELEASE.json | jq -r .CodeName) BUILD_TIMESTAMP = $(shell date +%F"_"%T)