From a6e392b1ed0f414f5200121eeb4efbe79aee3d4a Mon Sep 17 00:00:00 2001 From: pixiake Date: Mon, 21 Sep 2020 11:38:23 +0800 Subject: [PATCH] Refine version number Signed-off-by: pixiake --- Makefile | 3 +++ build.sh | 5 ++++- version/version.go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f7181a4..27fd3bc5 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,14 @@ GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null) GIT_DIRTY = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean") VERSION_METADATA = unreleased +VERSION = latest # Clear the "unreleased" string in BuildMetadata ifneq ($(GIT_TAG),) VERSION_METADATA = + VERSION = ${GIT_TAG} endif +LDFLAGS += -X github.com/kubesphere/kubekey/version.version=${VERSION} LDFLAGS += -X github.com/kubesphere/kubekey/version.metadata=${VERSION_METADATA} LDFLAGS += -X github.com/kubesphere/kubekey/version.gitCommit=${GIT_COMMIT} LDFLAGS += -X github.com/kubesphere/kubekey/version.gitTreeState=${GIT_DIRTY} diff --git a/build.sh b/build.sh index cb9b2b29..30afd5cc 100755 --- a/build.sh +++ b/build.sh @@ -8,13 +8,16 @@ GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "dirty" || echo "clean") VERSION_METADATA=unreleased +VERSION=latest # Clear the "unreleased" string in BuildMetadata if [[ -n $GIT_TAG ]] then VERSION_METADATA= + VERSION=${GIT_TAG} fi -LDFLAGS="-X github.com/kubesphere/kubekey/version.metadata=${VERSION_METADATA} +LDFLAGS="-X github.com/kubesphere/kubekey/version.version=${VERSION} + -X github.com/kubesphere/kubekey/version.metadata=${VERSION_METADATA} -X github.com/kubesphere/kubekey/version.gitCommit=${GIT_COMMIT} -X github.com/kubesphere/kubekey/version.gitTreeState=${GIT_DIRTY}" diff --git a/version/version.go b/version/version.go index 95680351..169e3c70 100644 --- a/version/version.go +++ b/version/version.go @@ -26,7 +26,7 @@ var ( // // Increment major number for new feature additions and behavioral changes. // Increment minor number for bug fixes and performance enhancements. - version = "v1.0.1" + version = "latest" // metadata is extra build time data metadata = ""