Merge pull request #69 from Regner/set-version-from-circle-tag

Set version from circle tag
regner · Aug 16, 2017 · 04d0f18 · 04d0f18
2 parents 5fecc23 + 389b849
commit 04d0f18
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -55,7 +55,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - run: go get github.com/tcnksm/ghr
-      - run: ghr -u regner -r albionmarket-client `git describe --tags` .
+      - run: ghr -t $GITHUB_TOKEN -u regner -r albionmarket-client $CIRCLE_TAG /tmp/workspace
 workflows:
   version: 2
   test_build_release:

diff --git a/scripts/build-darwin.sh b/scripts/build-darwin.sh
@@ -10,7 +10,7 @@ export CC=/usr/osxcross/bin/o64-clang
 export CXX=/usr/osxcross/bin/o64-clang++
 export GOOS=darwin
 export GOARCH=amd64 CGO_ENABLED=1
-go build -ldflags "-s -w -X main.version=`git describe --tags`" cmd/albionmarket-client/albionmarket-client.go
+go build -ldflags "-s -w -X main.version=$CIRCLE_TAG" cmd/albionmarket-client/albionmarket-client.go
 
 gzip -9 albionmarket-client
 mv albionmarket-client.gz update-darwin-amd64.gz
diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
@@ -4,7 +4,7 @@ sudo apt-get install -y libpcap-dev
 go get -u github.com/golang/dep/cmd/dep
 dep ensure
 
-go build -ldflags "-s -w -X main.version=`git describe --tags`" cmd/albionmarket-client/albionmarket-client.go
+go build -ldflags "-s -w -X main.version=$CIRCLE_TAG" cmd/albionmarket-client/albionmarket-client.go
 
 gzip -9 albionmarket-client
 mv albionmarket-client.gz update-linux-amd64.gz
diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
@@ -11,7 +11,7 @@ export GOARCH=amd64
 export CGO_ENABLED=1
 export CXX=x86_64-w64-mingw32-g++
 export CC=x86_64-w64-mingw32-gcc
-go build -ldflags "-s -w -X main.version=`git describe --tags`" -o albionmarket-client.exe -v -x cmd/albionmarket-client/albionmarket-client.go
+go build -ldflags "-s -w -X main.version=$CIRCLE_TAG" -o albionmarket-client.exe -v -x cmd/albionmarket-client/albionmarket-client.go
 
 gzip -9 albionmarket-client.exe
 mv albionmarket-client.exe.gz update-windows-amd64.exe.gz
diff --git a/scripts/validate-fmt.sh b/scripts/validate-fmt.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
+echo $CIRCLE_TAG
 
 IFS=$'\n'
 badFiles=($(goimports -l $(go list -f {{.Dir}} ./... | grep -v /vendor/)))