fix: version flag (#353)

* fix: version flag close #347 Signed-off-by: Yvonnick Esnault <[email protected]>
ovh · Jan 8, 2021 · 8d19a53 · 8d19a53
1 parent 984a392
commit 8d19a53
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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