github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2891 from thaJeztah/revert_temp_golang_fix

Browse Source 
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
This commit is contained in:
Phil Estes 2018-12-19 13:34:44 -05:00 committed by GitHub
commit 48bebbb6e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -107,9 +107,7 @@ all: binaries
check: proto-fmt ## run all linters
@echo "$(WHALE) $@"
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
# gometalinter --config .gometalinter.json ./...
gometalinter --config .gometalinter.json $(go list ./... | grep -v /vendor/)
gometalinter --config .gometalinter.json ./...
ci: check binaries checkprotos coverage coverage-integration ## to be used by the CI

7
script/setup/install-cni
View File

@ -25,12 +25,7 @@ CNI_COMMIT=$(grep containernetworking/plugins ${GOPATH}/src/github.com/container
CNI_DIR=/opt/cni
CNI_CONFIG_DIR=/etc/cni/net.d
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
# go get -d github.com/containernetworking/plugins/...
go get -d github.com/containernetworking/plugins || true
PACKAGES=$(go list github.com/containernetworking/plugins/... | grep -v /vendor/)
go get -d ${PACKAGES}
go get -d github.com/containernetworking/plugins/...
cd $GOPATH/src/github.com/containernetworking/plugins
git checkout $CNI_COMMIT
FASTBUILD=true ./build.sh

8
script/setup/install-critools
View File

@ -22,13 +22,7 @@ set -eu -o pipefail
go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=v1.12.0
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
# go get -d github.com/kubernetes-incubator/cri-tools/...
go get -d github.com/kubernetes-incubator/cri-tools || true
PACKAGES=$(go list github.com/kubernetes-incubator/cri-tools/... | grep -v /vendor/)
go get -d ${PACKAGES}
go get -d github.com/kubernetes-incubator/cri-tools/...
cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
git checkout $CRITEST_COMMIT
make