Merge pull request goadapp#161 from cwaltken-edrans/151-set-cli-version-when-using-travis-to-build-a-tagged-release

Use git tag when building goad with travis

Author: zeph

Makefile

@@ -17,7 +17,7 @@ BUILD := `git rev-parse HEAD`
 TIMESTAMP := `git log -1 --date=format:%Y%m%d%H%M --pretty=format:%cd`
 
 # Use linker flags to provide version/build settings to the target
-LDFLAGS = -ldflags "-X=github.com/goadapp/goad/version.version=$(VERSION) -X=github.com/goadapp/goad/version.build=$(BUILD)"
+LDFLAGS = -ldflags "-X=github.com/goadapp/goad/version.version=$(VERSION) -X=github.com/goadapp/goad/version.build=$(BUILD) -X=github.com/goadapp/goad/version.travisTag=$(TRAVIS_TAG)"
 
 # go source files, ignore vendor directory
 SRC = $(shell find . -type f -name '*.go' -not -path "./vendor/*")

version/version.go

@@ -4,8 +4,9 @@ import "strings"
 
 // Version describes the Goad version.
 var (
-	version string
-	build   string
+	version   string
+	build     string
+	travisTag string
 )
 
 // Version returns the version
@@ -21,9 +22,16 @@ func Build() string {
 	return build
 }
 
+func ReleaseVersion() string {
+	return travisTag
+}
+
 // String returns a composed string of version and build number
 func String() string {
-	return Version() + "-" + Build()
+	if ReleaseVersion() == "" {
+		return Version() + "-" + Build()
+	}
+	return ReleaseVersion()
 }
 
 // LambdaVersion returns a version string that can be used as a Lambda function