From 5711b46a8bd4cf9cda9f30f29946bfcf457224da Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 8 Sep 2019 13:30:24 +0200 Subject: [PATCH] Fixed version building --- Makefile | 2 +- main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 779a2c5..a22a500 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ GOFMT ?= gofmt -s GOFLAGS := -i -v EXTRA_GOFLAGS ?= -LDFLAGS := -X "models.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" +LDFLAGS := -X "git.kolaente.de/konrad/Konfi-Castle-Kasino/pkg/models.Version=$(shell git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')" -X "main.Tags=$(TAGS)" PACKAGES ?= $(filter-out git.mowie.cc/konrad/Konfi-Castle-Kasino/integrations,$(shell go list ./... | grep -v /vendor/)) SOURCES ?= $(shell find . -name "*.go" -type f) diff --git a/main.go b/main.go index 9fc7be7..fc311ec 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ func main() { # \_| \_/\__,_|___/_|_| |_|\___/ # # # # © 2017-2019 Konrad Langenberg (konradlangenberg.de) # -# Version: ` + models.Version + ` # +# Version: ` + models.Version + ` # ################################################################`) // Config