Merge pull request containerd#2880 from thaJeztah/1.1_backport_fix_ci_golang_1.11

crosbymichael · web-flow · commit 02e398d93e18 · 2018-12-14T10:15:09.000-05:00
[release/1.1 backport] Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
diff --git a/Makefile b/Makefile
@@ -107,7 +107,9 @@ all: binaries
 
 check: proto-fmt ## run all linters
 	@echo "$(WHALE) $@"
-	gometalinter --config .gometalinter.json ./...
+	# 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/)
 
 ci: check binaries checkprotos coverage coverage-integration ## to be used by the CI
 
diff --git a/script/setup/install-cni b/script/setup/install-cni
@@ -25,7 +25,12 @@ CNI_COMMIT=$(grep containernetworking/plugins ${GOPATH}/src/github.com/container
 CNI_DIR=/opt/cni
 CNI_CONFIG_DIR=/etc/cni/net.d
 
-go get -d github.com/containernetworking/plugins/...
+# 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}
+
 cd $GOPATH/src/github.com/containernetworking/plugins
 git checkout $CNI_COMMIT
 FASTBUILD=true ./build.sh
diff --git a/script/setup/install-critools b/script/setup/install-critools
@@ -22,7 +22,12 @@ set -eu -o pipefail
 
 go get -u github.com/onsi/ginkgo/ginkgo
 CRITEST_COMMIT=v1.0.0-beta.1
-go get -d github.com/kubernetes-incubator/cri-tools/...
+
+# 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}
 cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
 git checkout $CRITEST_COMMIT
 make
