Skip to content

Commit b55cf2c

Browse files
estespestesp
authored
Merge pull request #2892 from thaJeztah/1.1_revert_temp_golang_fix
[release/1.1] Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
2 parents 02e398d + 0e93a1e commit b55cf2c

3 files changed

Lines changed: 3 additions & 15 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ all: binaries
107107

108108
check: proto-fmt ## run all linters
109109
@echo "$(WHALE) $@"
110-
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
111-
# gometalinter --config .gometalinter.json ./...
112-
gometalinter --config .gometalinter.json $(go list ./... | grep -v /vendor/)
110+
gometalinter --config .gometalinter.json ./...
113111

114112
ci: check binaries checkprotos coverage coverage-integration ## to be used by the CI
115113

‎script/setup/install-cni‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ CNI_COMMIT=$(grep containernetworking/plugins ${GOPATH}/src/github.com/container
2525
CNI_DIR=/opt/cni
2626
CNI_CONFIG_DIR=/etc/cni/net.d
2727

28-
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
29-
# go get -d github.com/containernetworking/plugins/...
30-
go get -d github.com/containernetworking/plugins || true
31-
PACKAGES=$(go list github.com/containernetworking/plugins/... | grep -v /vendor/)
32-
go get -d ${PACKAGES}
33-
28+
go get -d github.com/containernetworking/plugins/...
3429
cd $GOPATH/src/github.com/containernetworking/plugins
3530
git checkout $CNI_COMMIT
3631
FASTBUILD=true ./build.sh

‎script/setup/install-critools‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ set -eu -o pipefail
2222

2323
go get -u github.com/onsi/ginkgo/ginkgo
2424
CRITEST_COMMIT=v1.0.0-beta.1
25-
26-
# FIXME temporarily disabled due to a regression in Go 1.10.6 / 1.11.3 (https://github.com/golang/go/issues/29241)
27-
# go get -d github.com/kubernetes-incubator/cri-tools/...
28-
go get -d github.com/kubernetes-incubator/cri-tools || true
29-
PACKAGES=$(go list github.com/kubernetes-incubator/cri-tools/... | grep -v /vendor/)
30-
go get -d ${PACKAGES}
25+
go get -d github.com/kubernetes-incubator/cri-tools/...
3126
cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
3227
git checkout $CRITEST_COMMIT
3328
make

0 commit comments

Comments
 (0)