Skip to content

Commit

Permalink
build: Fix Travis vet issues (hashicorp#14010)
Browse files Browse the repository at this point in the history
* Use latest in go 1.8 branch for travis

* Fix ongoing vet issues
Move vet step after the testing step in travis
Correct Makefile vet step to check correct files
  • Loading branch information
cblecker authored and stack72 committed Apr 27, 2017
1 parent 8eb3ac2 commit 3f7a117
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dist: trusty
sudo: false
language: go
go:
- 1.8
- 1.8.x

# add TF_CONSUL_TEST=1 to run consul tests
# they were causing timouts in travis
Expand All @@ -25,7 +25,7 @@ install:
- bash scripts/gogetcookie.sh
- go get github.com/kardianos/govendor
script:
- make vet vendor-status test
- make vendor-status test vet
- GOOS=windows go build
branches:
only:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ cover:
# vet runs the Go source code static analysis tool `vet` to find
# any common errors.
vet:
@echo "go vet ."
@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \
@echo 'go vet $$(go list ./... | grep -v /terraform/vendor/)'
@go vet $$(go list ./... | grep -v /terraform/vendor/) ; if [ $$? -eq 1 ]; then \
echo ""; \
echo "Vet found suspicious constructs. Please check the reported constructs"; \
echo "and fix them if necessary before submitting the code for review."; \
Expand Down

0 comments on commit 3f7a117

Please sign in to comment.