Merge pull request #106 from davidz627/fix/TravisAndTags

Lock travis.ci go version to 1.10.3 and add soft tag to revision
kubernetes-csi · Jun 29, 2018 · a0bc91b · a0bc91b
2 parents aa344a1 + 6c65189
commit a0bc91b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 matrix:
   include:
-  - go: 1.x
+  - go: 1.10.3
 install:
   - go get -u github.com/golang/dep/cmd/dep
   - dep ensure -vendor-only

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ IMAGE_NAME=csi-provisioner
 IMAGE_VERSION=canary
 IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
 
-REV=$(shell git describe --long --match='v*' --dirty)
+REV=$(shell git describe --long --tags --match='v*' --dirty)
 
 ifdef V
 TESTARGS = -v -args -alsologtostderr -v 5