Merge pull request #261 from xetys/fix-ldflag-version-override

Fix version definition
xetys · May 7, 2019 · 083b356 · 083b356
2 parents 6cbe000 + 90322c3
commit 083b356
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ jobs:
   include:
     - stage: E2E testing
       script:
-        - go build
+        - go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=`git rev-parse --short HEAD`"
         - export DATACENTER=$(make detect-datacenter)
         - make test-all
         - make cleanup

diff --git a/Makefile b/Makefile
@@ -16,24 +16,26 @@ build-cleanup:
 
 build: build-cleanup
 	@mkdir -p dist
-	CGO_ENABLED=0 GOOS=linux   GOARCH=amd64 go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-amd64
-	CGO_ENABLED=0 GOOS=linux   GOARCH=386   go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-386
-	CGO_ENABLED=0 GOOS=linux   GOARCH=arm   go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-arm
-	CGO_ENABLED=0 GOOS=linux   GOARCH=arm64 go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-arm64
-	CGO_ENABLED=0 GOOS=darwin  GOARCH=amd64 go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-darwin-amd64
-	CGO_ENABLED=0 GOOS=darwin  GOARCH=386   go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-darwin-386
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-windows-amd64.exe
-	CGO_ENABLED=0 GOOS=windows GOARCH=386   go build -ldflags "-X cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-windows-386.exe
+	CGO_ENABLED=0 GOOS=linux   GOARCH=amd64 go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-amd64
+	CGO_ENABLED=0 GOOS=linux   GOARCH=386   go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-386
+	CGO_ENABLED=0 GOOS=linux   GOARCH=arm   go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-arm
+	CGO_ENABLED=0 GOOS=linux   GOARCH=arm64 go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-linux-arm64
+	CGO_ENABLED=0 GOOS=darwin  GOARCH=amd64 go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-darwin-amd64
+	CGO_ENABLED=0 GOOS=darwin  GOARCH=386   go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-darwin-386
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-windows-amd64.exe
+	CGO_ENABLED=0 GOOS=windows GOARCH=386   go build -ldflags "-X github.com/xetys/hetzner-kube/cmd.version=${VERSION}" -o dist/hetzner-kube-${VERSION}-windows-386.exe
 
 test-preparare:
 	mkdir -p ${SSH_KEY_FOLDER}
 	ssh-keygen -t rsa -b 4096 -P "" -f ${SSH_KEY_FOLDER}/id_rsa
 
-test-all: test-preparare test-info test-context test-ssh-key test-clusters
+test-all: test-preparare test-help test-version test-context test-ssh-key test-clusters
 
-test-info:
+test-help:
 	${HETZNER_KUBE} help
-	${HETZNER_KUBE} version
+
+test-version:
+	${HETZNER_KUBE} version | grep -q $(shell git rev-parse --short HEAD)
 
 test-context:
 	${HETZNER_KUBE} context add ${CONTEXT_NAME} --token ${HETZNER_API_KEY}

diff --git a/cmd/version.go b/cmd/version.go
@@ -7,7 +7,7 @@ import (
 )
 
 // Version The current version of hetzner-kube.
-const version = "DEVELOP"
+var version = "DEVELOP"
 
 // versionCmd represents the version command
 var versionCmd = &cobra.Command{