go 1.10: update travis and gofmt (#1541)

* go 1.10: update travis and gofmt

fmt now complains about on file tls_test.go, fix that. Also remove
gofmt, as goimports also checks, so this was done twice.

Put go 1.9 and 1.10 in travis for the time being.

* goimports optional
This commit is contained in:
Miek Gieben 2018-02-18 09:43:56 +01:00 committed by GitHub
parent 8cce06cba1
commit 05e41c5969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions

View file

@ -7,7 +7,8 @@ services:
language: go
go:
- 1.9
- "1.9"
- "1.10"
go_import_path: github.com/coredns/coredns

View file

@ -12,7 +12,7 @@ coredns: $(CHECKS)
CGO_ENABLED=0 $(SYSTEM) go build $(VERBOSE) -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=$(GITCOMMIT)" -o $(BINARY)
.PHONY: check
check: linter core/zplugin.go core/dnsserver/zdirectives.go godeps
check: linter goimports core/zplugin.go core/dnsserver/zdirectives.go godeps
.PHONY: test
test: check
@ -78,7 +78,11 @@ gen:
linter:
go get -u github.com/alecthomas/gometalinter
gometalinter --install golint
gometalinter --deadline=2m --disable-all --enable=gofmt --enable=golint --enable=vet --enable=goimports --exclude=^vendor/ --exclude=^pb/ ./...
gometalinter --deadline=2m --disable-all --enable=golint --enable=vet --vendor --exclude=^pb/ ./...
.PHONY: goimports
goimports:
( gometalinter --deadline=2m --disable-all --enable=goimports --vendor --exclude=^pb/ ./... || true )
.PHONY: clean
clean:

View file

@ -18,8 +18,8 @@ func TestTLS(t *testing.T) {
expectedRoot string // expected root, set to the controller. Empty for negative cases.
expectedErrContent string // substring from the expected error. Empty for positive cases.
}{
// positive
// negative
// positive
// negative
}
for i, test := range tests {