From c90681a7e4f05c189616c1b9f4c6567bddef3404 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 14 Mar 2019 14:39:39 +0100 Subject: [PATCH 1/3] Fix version definition Closes #260 --- cmd/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/version.go b/cmd/version.go index 026af8fc..2fe7e86b 100644 --- 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{ From e46b529a537cbb50506ad8b3cbdeffa41d8a11ee Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 14 Mar 2019 20:46:25 +0100 Subject: [PATCH 2/3] improve test on version --- .travis.yml | 2 +- Makefile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb406f32..19615f53 100644 --- 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 index d101d459..7cbd579d 100644 --- a/Makefile +++ b/Makefile @@ -29,11 +29,13 @@ 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} From 90322c3b371c04aaa3843db1cc4ff783d9652301 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 14 Mar 2019 20:46:41 +0100 Subject: [PATCH 3/3] fix version on hetzner-kube released on github --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7cbd579d..8dfd7539 100644 --- a/Makefile +++ b/Makefile @@ -16,14 +16,14 @@ 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}