Merge pull request #2008 from thaJeztah/bump-golang-to-1.10
Bump to Go 1.10
This commit is contained in:
commit
255ad41cfc
@ -11,7 +11,9 @@ branches:
|
|||||||
environment:
|
environment:
|
||||||
GOPATH: C:\gopath
|
GOPATH: C:\gopath
|
||||||
CGO_ENABLED: 1
|
CGO_ENABLED: 1
|
||||||
GO_VERSION: 1.9
|
matrix:
|
||||||
|
- GO_VERSION: 1.9
|
||||||
|
- GO_VERSION: 1.10
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- choco install -y mingw
|
- choco install -y mingw
|
||||||
|
@ -7,7 +7,8 @@ services:
|
|||||||
language: go
|
language: go
|
||||||
|
|
||||||
go:
|
go:
|
||||||
- 1.9.x
|
- "1.9.x"
|
||||||
|
- "1.10"
|
||||||
|
|
||||||
go_import_path: github.com/containerd/containerd
|
go_import_path: github.com/containerd/containerd
|
||||||
|
|
||||||
@ -56,7 +57,7 @@ script:
|
|||||||
- script/validate/vendor
|
- script/validate/vendor
|
||||||
- go build -i .
|
- go build -i .
|
||||||
- make check
|
- 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 build
|
||||||
- make binaries
|
- make binaries
|
||||||
- if [ "$GOOS" = "linux" ]; then sudo make install ; fi
|
- if [ "$GOOS" = "linux" ]; then sudo make install ; fi
|
||||||
|
@ -158,9 +158,7 @@ func (m *ContainerCreate_Runtime) Field(fieldpath []string) (string, bool) {
|
|||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
|
||||||
adaptor, ok := decoded.(interface {
|
adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
|
||||||
Field([]string) (string, bool)
|
|
||||||
})
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
@ -115,9 +115,7 @@ func (m *Envelope) Field(fieldpath []string) (string, bool) {
|
|||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
|
||||||
adaptor, ok := decoded.(interface {
|
adaptor, ok := decoded.(interface{ Field([]string) (string, bool) })
|
||||||
Field([]string) (string, bool)
|
|
||||||
})
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user