Skip to content

Commit

Permalink
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
Browse files Browse the repository at this point in the history
This reverts commit 66a3eeb.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Dec 19, 2018
1 parent 02e398d commit 0e93a1e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 1 addition & 3 deletions Makefile
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions script/setup/install-cni
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions script/setup/install-critools
Expand Up @@ -22,12 +22,7 @@ set -eu -o pipefail

go get -u github.com/onsi/ginkgo/ginkgo
CRITEST_COMMIT=v1.0.0-beta.1

# 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
Expand Down

0 comments on commit 0e93a1e

Please sign in to comment.