diff --git a/Makefile b/Makefile index b505032b..be109bd2 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,12 @@ RELEASE_DARWIN_AMD64 = $(RELEASE_ROOT)/darwin-amd64/$(TARGET) RELEASE_DARWIN_ARM64 = $(RELEASE_ROOT)/darwin-arm64/$(TARGET) RELEASE_WINDOWS_AMD64 = $(RELEASE_ROOT)/windows-amd64/$(TARGET) +BUILD_VERSION := $(shell git describe --tags | cut -f 1 -d "-") BUILD_DATE := $(shell date +'%Y-%m-%d %H:%M:%S') SHA_SHORT := $(shell git rev-parse --short HEAD) TAGS = "" -LDFLAGS = -X "main.buildDate=${BUILD_DATE}" -X "main.commitID=${SHA_SHORT}" -w -s +LDFLAGS = -X "main.version=${BUILD_VERSION}" -X "main.buildDate=${BUILD_DATE}" -X "main.commitID=${SHA_SHORT}" -w -s all: fmt build diff --git a/main.go b/main.go index dbf61725..17290c01 100644 --- a/main.go +++ b/main.go @@ -15,9 +15,7 @@ import ( ) var ( - version = "v0.2.0" - buildDate string - commitID string + version, commitID, buildDate string noDefaultFeatures bool features suites