Disable go modules (#4583)
This commit is contained in:
parent
ba38153561
commit
189e742685
5 changed files with 13 additions and 2 deletions
8
Makefile
8
Makefile
|
@ -58,11 +58,15 @@ GOOS = linux
|
||||||
|
|
||||||
MULTI_ARCH_IMAGE = $(REGISTRY)/nginx-ingress-controller-${ARCH}
|
MULTI_ARCH_IMAGE = $(REGISTRY)/nginx-ingress-controller-${ARCH}
|
||||||
|
|
||||||
|
# use vendor directory instead of go modules https://github.com/golang/go/wiki/Modules
|
||||||
|
GO111MODULE=off
|
||||||
|
|
||||||
export ARCH
|
export ARCH
|
||||||
export TAG
|
export TAG
|
||||||
export PKG
|
export PKG
|
||||||
export GOARCH
|
export GOARCH
|
||||||
export GOOS
|
export GOOS
|
||||||
|
export GO111MODULE
|
||||||
export GIT_COMMIT
|
export GIT_COMMIT
|
||||||
export GOBUILD_FLAGS
|
export GOBUILD_FLAGS
|
||||||
export REPO_INFO
|
export REPO_INFO
|
||||||
|
@ -202,9 +206,9 @@ check_dead_links:
|
||||||
|
|
||||||
.PHONY: dep-ensure
|
.PHONY: dep-ensure
|
||||||
dep-ensure:
|
dep-ensure:
|
||||||
GO111MODULE=on go mod tidy -v
|
go mod tidy -v
|
||||||
find vendor -name '*_test.go' -delete
|
find vendor -name '*_test.go' -delete
|
||||||
GO111MODULE=on go mod vendor
|
go mod vendor
|
||||||
|
|
||||||
.PHONY: dev-env
|
.PHONY: dev-env
|
||||||
dev-env:
|
dev-env:
|
||||||
|
|
|
@ -44,6 +44,8 @@ if [ "$missing" = true ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export CGO_ENABLED=0
|
export CGO_ENABLED=0
|
||||||
|
# use vendor directory instead of go modules https://github.com/golang/go/wiki/Modules
|
||||||
|
export GO111MODULE=off
|
||||||
|
|
||||||
release=cmd/plugin/release
|
release=cmd/plugin/release
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@ fi
|
||||||
|
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
export GODEBUG=netdns=go+2
|
export GODEBUG=netdns=go+2
|
||||||
|
# use vendor directory instead of go modules https://github.com/golang/go/wiki/Modules
|
||||||
|
export GO111MODULE=off
|
||||||
|
|
||||||
rm -rf coverage.txt
|
rm -rf coverage.txt
|
||||||
for d in $(go list "${PKG}/..." | grep -v vendor | grep -v '/test/e2e' | grep -v images); do
|
for d in $(go list "${PKG}/..." | grep -v vendor | grep -v '/test/e2e' | grep -v images); do
|
||||||
|
|
|
@ -53,6 +53,7 @@ docker run \
|
||||||
--rm \
|
--rm \
|
||||||
${DOCKER_OPTS} \
|
${DOCKER_OPTS} \
|
||||||
-e GOCACHE="/go/src/${PKG}/.cache" \
|
-e GOCACHE="/go/src/${PKG}/.cache" \
|
||||||
|
-e GO111MODULE=off \
|
||||||
-v "${HOME}/.kube:${HOME}/.kube" \
|
-v "${HOME}/.kube:${HOME}/.kube" \
|
||||||
-v "${KUBE_ROOT}:/go/src/${PKG}" \
|
-v "${KUBE_ROOT}:/go/src/${PKG}" \
|
||||||
-v "${KUBE_ROOT}/bin/${ARCH}:/go/bin/linux_${ARCH}" \
|
-v "${KUBE_ROOT}/bin/${ARCH}:/go/bin/linux_${ARCH}" \
|
||||||
|
|
|
@ -31,6 +31,8 @@ fi
|
||||||
# enabled to use host dns resolver
|
# enabled to use host dns resolver
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
export GODEBUG=netdns=go+2
|
export GODEBUG=netdns=go+2
|
||||||
|
# use vendor directory instead of go modules https://github.com/golang/go/wiki/Modules
|
||||||
|
export GO111MODULE=off
|
||||||
|
|
||||||
go test -v -race \
|
go test -v -race \
|
||||||
$(go list "${PKG}/..." | grep -v vendor | grep -v '/test/e2e' | grep -v images | grep -v "docs/examples")
|
$(go list "${PKG}/..." | grep -v vendor | grep -v '/test/e2e' | grep -v images | grep -v "docs/examples")
|
||||||
|
|
Loading…
Reference in a new issue