diff --git a/.build/core.mk b/.build/core.mk index de14a10f..5b7ac404 100644 --- a/.build/core.mk +++ b/.build/core.mk @@ -1,5 +1,4 @@ CI := $(if ${CI},${CI},0) -VERSION := $(if ${CDS_SEMVER},${CDS_SEMVER},snapshot) CDS_VERSION := $(if ${CDS_VERSION},${CDS_VERSION},snapshot) UNAME := $(shell uname) UNAME_LOWERCASE := $(shell uname -s| tr A-Z a-z) diff --git a/.build/go.mk b/.build/go.mk index 75a8ffeb..b353f4fe 100644 --- a/.build/go.mk +++ b/.build/go.mk @@ -6,7 +6,6 @@ TEST_CMD = go test -v -timeout 600s -coverprofile=profile.coverprofile TEST_C_CMD = go test -c -coverprofile=profile.coverprofile TEST_RUN_ARGS = -test.v -test.timeout 600s -test.coverprofile=profile.coverprofile CURRENT_PACKAGE = $(shell $(GO_LIST)) -VERSION := $(if ${CDS_SEMVER},${CDS_SEMVER},snapshot) TARGET_DIST := ./dist TARGET_RESULTS := ./results diff --git a/cmd/venom/Makefile b/cmd/venom/Makefile index 0937025a..c0a97ce2 100644 --- a/cmd/venom/Makefile +++ b/cmd/venom/Makefile @@ -4,7 +4,7 @@ ##### ^^^^^^ make help ^^^^^^ ##### TARGET_NAME = venom -LDFLAGS = -ldflags "-X github.com/ovh/venom.Version=$(VERSION)" +LDFLAGS = -ldflags "-X github.com/ovh/venom.Version=$(if ${GIT_DESCRIBE},${GIT_DESCRIBE},snapshot)" # If you want to enable the cross-compilation, uncomment the following line: ENABLE_CROSS_COMPILATION := true