Regenerate protos with Go 1.10, and make check conditional

Gofmt changed in Go 1.10, so regenerating with the new formatting.
From the Go 1.10 release notes: https://golang.org/doc/go1.10#gofmt

> Gofmt
> ... Second, single-method interface literals written on a single line,
> which are sometimes used in type assertions, are no longer split onto multiple lines.

The travis configuration was updated to skip `check-protos` on Go 1.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2018-02-21 10:45:57 +01:00
parent 931000c041
commit b17bcb7284
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
3 changed files with 3 additions and 7 deletions

View File

@ -57,7 +57,7 @@ script:
- script/validate/vendor
- go build -i .
- make check
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi
- if [[ "$GOOS" = "linux" && "$TRAVIS_GO_VERSION" != "1.9"* ]]; then make check-protos check-api-descriptors; fi
- make build
- make binaries
- if [ "$GOOS" = "linux" ]; then sudo make install ; fi

View File

@ -158,9 +158,7 @@ func (m *ContainerCreate_Runtime) Field(fieldpath []string) (string, bool) {
return "", false
}
adaptor, ok := decoded.(interface {
Field([]string) (string, bool)
})
adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
if !ok {
return "", false
}

View File

@ -115,9 +115,7 @@ func (m *Envelope) Field(fieldpath []string) (string, bool) {
return "", false
}
adaptor, ok := decoded.(interface {
Field([]string) (string, bool)
})
adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
if !ok {
return "", false
}