fix(version): move all version logic to git (#167)

Author: Joshua-Anderson

Jenkinsfile

@@ -144,7 +144,7 @@ parallel(
 					}
 
 					make 'bootstrap'
-					env.VERSION = git_commit.take(7)
+					env.REVISION = git_commit.take(7)
 					make 'build-revision'
 
 					upload_artifacts()

Makefile

@@ -8,6 +8,18 @@ else
 	GOOS=linux
 endif
 
+# The latest git tag on branch
+GIT_TAG := $(shell git describe --abbrev=0 --tags)
+# If the latest commit is tagged
+TAGGED_COMMIT := $(shell git tag -l --contains HEAD)
+REVISION ?= $(shell git rev-parse --short HEAD)
+
+ifdef TAGGED_COMMIT
+	VERSION ?= ${GIT_TAG}
+else
+	VERSION ?= ${GIT_TAG}-${REVISION}
+endif
+
 BUILD_OS ?=linux darwin windows
 BUILD_ARCH ?=amd64 386
 
@@ -18,13 +30,9 @@ DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e CGO_ENABLED=1 -v ${CURDIR}:${DE
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 DIST_DIR := _dist
 
-GO_LDFLAGS = -ldflags "-s -X ${repo_path}/version.BuildVersion=${VERSION}"
+GO_LDFLAGS = -ldflags "-s -X ${repo_path}/version.Version=${VERSION}"
 GOTEST = go test --race
 
-# The tag of the commit
-GIT_TAG := $(shell git tag -l --contains HEAD)
-VERSION ?= $(shell git rev-parse --short HEAD)
-
 # UID and GID of local user
 UID := $(shell id -u)
 GID := $(shell id -g)
@@ -51,10 +59,10 @@ build-latest:
 	${DEV_ENV_CMD} gox -verbose -parallel=3 ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="$(DIST_DIR)/deis-latest-{{.OS}}-{{.Arch}}" .
 
 build-revision:
-ifdef GIT_TAG
+ifdef TAGGED_COMMIT
 	${DEV_ENV_CMD} gox -verbose -parallel=3 ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="$(DIST_DIR)/${GIT_TAG}/deis-${GIT_TAG}-{{.OS}}-{{.Arch}}" .
 else
-	${DEV_ENV_CMD} gox -verbose -parallel=3 ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="$(DIST_DIR)/${VERSION}/deis-${VERSION}-{{.OS}}-{{.Arch}}" .
+	${DEV_ENV_CMD} gox -verbose -parallel=3 ${GO_LDFLAGS} -os="${BUILD_OS}" -arch="${BUILD_ARCH}" -output="$(DIST_DIR)/${REVISION}/deis-${REVISION}-{{.OS}}-{{.Arch}}" .
 endif
 
 build-all: build-latest build-revision

parser/version.go

@@ -20,11 +20,7 @@ Use 'deis help [command]' to learn more.
 		return err
 	}
 
-	v := version.Version
-	if version.BuildVersion != "" {
-		v = fmt.Sprintf("%s-%s", version.Version, version.BuildVersion)
-	}
-	fmt.Println(v)
+	fmt.Println(version.Version)
 
 	return nil
 }

settings/settings.go

@@ -11,14 +11,12 @@ import (
 	"github.com/deis/workflow-cli/version"
 )
 
-const (
-	// UserAgent is the user agent used by the CLI
-	UserAgent = "Deis Client v" + version.Version
+// DefaultResponseLimit is the default number of responses to return on requests that can
+// be limited.
+const DefaultResponseLimit = 100
 
-	// DefaultResponseLimit is the default number of responses to return on requests that can
-	// be limited.
-	DefaultResponseLimit = 100
-)
+// UserAgent is the user agent used by the CLI
+var UserAgent = "Deis Client v" + version.Version
 
 type settingsFile struct {
 	Username   string `json:"username"`

version/version.go

@@ -1,8 +1,5 @@
 package version
 
-// Version identifies this Deis product revision.
-const Version = "2.3.0"
-
-// BuildVersion is the git revision of the build.
+// Version identifies the Deis product revision.
 // Note: This value is overwritten by the linker during build
-var BuildVersion = ""
+var Version = "unknown version (override me)"