feat: add build time version for Database Lab server and CLI (#79)

agneum · agneum · commit 6030d00e1516 · 2020-08-21T13:37:11.000+07:00
diff --git a/Makefile b/Makefile
@@ -4,19 +4,16 @@ SERVER_BINARY = dblab-server
 CLI_BINARY = dblab
 GOARCH = amd64
 
-VERSION?=0.3.1
+COMMIT?=$(shell git rev-parse HEAD)
 BUILD_TIME?=$(shell date -u '+%Y%m%d-%H%M')
-COMMIT?=no #$(shell git rev-parse HEAD)
-BRANCH?=no #$(shell git rev-parse --abbrev-ref HEAD)
+VERSION=$(shell git describe --tags 2>/dev/null || echo "${COMMIT}")
 
 # Symlink into GOPATH
 BUILD_DIR=${GOPATH}/${SERVER_BINARY}
 
 # Setup the -ldflags option for go build here, interpolate the variable values
 LDFLAGS = -ldflags "-s -w \
 	-X gitlab.com/postgres-ai/database-lab/version.version=${VERSION} \
-	-X main.commit=${COMMIT} \
-	-X main.branch=${BRANCH}\
 	-X gitlab.com/postgres-ai/database-lab/version.buildTime=${BUILD_TIME}"
 
 # Go tooling command aliases
diff --git a/cmd/database-lab/main.go b/cmd/database-lab/main.go
@@ -26,6 +26,7 @@ import (
 	"gitlab.com/postgres-ai/database-lab/pkg/services/platform"
 	"gitlab.com/postgres-ai/database-lab/pkg/services/provision"
 	"gitlab.com/postgres-ai/database-lab/pkg/srv"
+	"gitlab.com/postgres-ai/database-lab/version"
 )
 
 var opts struct {
@@ -39,6 +40,8 @@ var opts struct {
 }
 
 func main() {
+	log.Msg("Database Lab version: ", version.GetVersion())
+
 	// Load CLI options.
 	if _, err := parseArgs(); err != nil {
 		if flags.WroteHelp(err) {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"gitlab.com/postgres-ai/database-lab/pkg/services/platform"`
`27`	`27`	`"gitlab.com/postgres-ai/database-lab/pkg/services/provision"`
`28`	`28`	`"gitlab.com/postgres-ai/database-lab/pkg/srv"`
	`29`	`+ "gitlab.com/postgres-ai/database-lab/version"`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`var opts struct {`
`@@ -39,6 +40,8 @@ var opts struct {`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`func main() {`
	`43`	`+ log.Msg("Database Lab version: ", version.GetVersion())`
	`44`	`+`
`42`	`45`	`// Load CLI options.`
`43`	`46`	`if _, err := parseArgs(); err != nil {`
`44`	`47`	`if flags.WroteHelp(err) {`