update travis to build with go1.10
Remove the vet target too, since vet is now always run with every test.
This commit is contained in:
parent
a37acb1837
commit
3bc1dcf21a
|
@ -2,7 +2,7 @@ dist: trusty
|
||||||
sudo: false
|
sudo: false
|
||||||
language: go
|
language: go
|
||||||
go:
|
go:
|
||||||
- 1.9.1
|
- 1.10
|
||||||
|
|
||||||
# add TF_CONSUL_TEST=1 to run consul tests
|
# add TF_CONSUL_TEST=1 to run consul tests
|
||||||
# they were causing timouts in travis
|
# they were causing timouts in travis
|
||||||
|
@ -34,7 +34,6 @@ script:
|
||||||
- make vendor-status
|
- make vendor-status
|
||||||
- make test
|
- make test
|
||||||
- make e2etest
|
- make e2etest
|
||||||
- make vet
|
|
||||||
- GOOS=windows go build
|
- GOOS=windows go build
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
|
|
13
Makefile
13
Makefile
|
@ -68,17 +68,6 @@ cover:
|
||||||
go tool cover -html=coverage.out
|
go tool cover -html=coverage.out
|
||||||
rm coverage.out
|
rm coverage.out
|
||||||
|
|
||||||
# vet runs the Go source code static analysis tool `vet` to find
|
|
||||||
# any common errors.
|
|
||||||
vet:
|
|
||||||
@echo 'go vet ./...'
|
|
||||||
@go vet ./... ; 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."; \
|
|
||||||
exit 1; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# generate runs `go generate` to build the dynamically generated
|
# generate runs `go generate` to build the dynamically generated
|
||||||
# source files.
|
# source files.
|
||||||
generate:
|
generate:
|
||||||
|
@ -102,4 +91,4 @@ vendor-status:
|
||||||
# under parallel conditions.
|
# under parallel conditions.
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
|
|
||||||
.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet
|
.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status
|
||||||
|
|
Loading…
Reference in New Issue