Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/1.2] Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)" #2893

Merged
merged 1 commit into from Dec 19, 2018
Merged

[release/1.2] Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)" #2893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 1 addition & 7 deletions script/setup/install-critools
View file
Open in desktop
Expand Up @@ -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
Expand Down