From 6ac7005c40226e8bd28e9c264cff9702646b702f Mon Sep 17 00:00:00 2001 From: lystopad Date: Thu, 12 Sep 2024 16:03:53 +0200 Subject: [PATCH] Fix for the issues/11968 (#11969) Use wider pattern to find most recent tag (not prefixed with "v") and set commit id by 7 chars only. See - https://github.com/erigontech/erigon/issues/11968 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8cba73a6a57..7c58c02a28a 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DOCKER := $(shell command -v docker 2> /dev/null) GIT_COMMIT ?= $(shell git rev-list -1 HEAD) GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) -GIT_TAG ?= $(shell git describe --tags '--match=v*' --dirty) +GIT_TAG ?= $(shell git describe --tags '--match=*.*.*' --abbrev=7 --dirty) ERIGON_USER ?= erigon # if using volume-mounting data dir, then must exist on host OS DOCKER_UID ?= $(shell id -u)