Skip to content

Commit

Permalink
Merge pull request #106 from davidz627/fix/TravisAndTags
Browse files Browse the repository at this point in the history
Lock travis.ci go version to 1.10.3 and add soft tag to revision
  • Loading branch information
jsafrane authored Jun 29, 2018
2 parents aa344a1 + 6c65189 commit a0bc91b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a0bc91b

Please sign in to comment.