From 79bc60e24875fde31bc853144374ea8fa3154da0 Mon Sep 17 00:00:00 2001 From: mahjonp Date: Fri, 26 Feb 2021 14:39:29 +0800 Subject: [PATCH] release v1.0.5 Signed-off-by: mahjonp --- .gitignore | 1 + .goreleaser.yml | 1 + Makefile | 6 +++--- cmd/go-tpc/versioninfo.go | 12 ++++++++---- install.sh | 2 +- pkg/util/versioninfo.go | 8 -------- 6 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 pkg/util/versioninfo.go diff --git a/.gitignore b/.gitignore index 498b0ea..6a044be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin .idea/ +dist/ diff --git a/.goreleaser.yml b/.goreleaser.yml index fb4f273..56eeb47 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,6 +14,7 @@ builds: goos: - linux - darwin + mod_timestamp: '{{ .CommitTimestamp }}' archives: - files: diff --git a/Makefile b/Makefile index 7bceb55..f4edff0 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,9 @@ PACKAGE_LIST := go list ./...| grep -vE "cmd" PACKAGES := $$($(PACKAGE_LIST)) FILES_TO_FMT := $(shell find . -path -prune -o -name '*.go' -print) -LDFLAGS += -X "github.com/pingcap/go-tpc/pkg/util.ReleaseVersion=$(shell git describe --tags --dirty --always)" -LDFLAGS += -X "github.com/pingcap/go-tpc/pkg/util.BuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')" -LDFLAGS += -X "github.com/pingcap/go-tpc/pkg/util.BuildHash=$(shell git rev-parse HEAD)" +LDFLAGS += -X "main.version=$(shell git describe --tags --dirty --always)" +LDFLAGS += -X "main.commit=$(shell date -u '+%Y-%m-%d %I:%M:%S')" +LDFLAGS += -X "main.date=$(shell git rev-parse HEAD)" GOBUILD=$(GO) build -ldflags '$(LDFLAGS)' diff --git a/cmd/go-tpc/versioninfo.go b/cmd/go-tpc/versioninfo.go index ab94c3f..498939b 100644 --- a/cmd/go-tpc/versioninfo.go +++ b/cmd/go-tpc/versioninfo.go @@ -4,14 +4,18 @@ import ( "fmt" "github.com/spf13/cobra" +) - "github.com/pingcap/go-tpc/pkg/util" +var ( + version = "dev" + commit = "none" + date = "unknown" ) func printVersion() { - fmt.Println("Git Commit Hash:", util.BuildHash) - fmt.Println("UTC Build Time:", util.BuildTS) - fmt.Println("Release version:", util.ReleaseVersion) + fmt.Println("Git Commit Hash:", commit) + fmt.Println("UTC Build Time:", date) + fmt.Println("Release version:", version) } func registerVersionInfo(root *cobra.Command) { diff --git a/install.sh b/install.sh index fd78224..23e4ced 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/sh -version=1.0.4 +version=1.0.5 case $(uname -s) in Linux|linux) os=linux ;; diff --git a/pkg/util/versioninfo.go b/pkg/util/versioninfo.go deleted file mode 100644 index 28b63e6..0000000 --- a/pkg/util/versioninfo.go +++ /dev/null @@ -1,8 +0,0 @@ -package util - -// Version information -var ( - ReleaseVersion string - BuildTS string - BuildHash string -)