Fix the resolved TAG_NAME for commit in multiple tags
This commit is contained in:
parent
306d3f277d
commit
fc563d3f6e
1 changed files with 1 additions and 4 deletions
5
Makefile
5
Makefile
|
@ -1,13 +1,10 @@
|
||||||
SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/')
|
SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/')
|
||||||
|
|
||||||
TAG_NAME := $(shell git tag -l --contains HEAD)
|
TAG_NAME := $(shell git describe --abbrev=0 --tags --exact-match)
|
||||||
SHA := $(shell git rev-parse HEAD)
|
SHA := $(shell git rev-parse HEAD)
|
||||||
VERSION_GIT := $(if $(TAG_NAME),$(TAG_NAME),$(SHA))
|
VERSION_GIT := $(if $(TAG_NAME),$(TAG_NAME),$(SHA))
|
||||||
VERSION := $(if $(VERSION),$(VERSION),$(VERSION_GIT))
|
VERSION := $(if $(VERSION),$(VERSION),$(VERSION_GIT))
|
||||||
|
|
||||||
GIT_BRANCH := $(subst heads/,,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
|
|
||||||
|
|
||||||
REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]')
|
|
||||||
BIN_NAME := traefik
|
BIN_NAME := traefik
|
||||||
CODENAME ?= cheddar
|
CODENAME ?= cheddar
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue