mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #76511 from liggitt/fixup-vendor-gopath
stop clearing GOPATH in vendor scripts
This commit is contained in:
commit
ed5c7e6bfb
@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
# Explicitly opt into go modules, even though we're inside a GOPATH directory
|
||||
export GO111MODULE=on
|
||||
# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
|
||||
export GOPATH=
|
||||
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
|
||||
export GOFLAGS=
|
||||
# Detect problematic GOPROXY settings that prevent lookup of dependencies
|
||||
|
@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
# Explicitly opt into go modules, even though we're inside a GOPATH directory
|
||||
export GO111MODULE=on
|
||||
# Explicitly clear GOPATH, to ensure nothing this script calls makes use of that path info
|
||||
export GOPATH=
|
||||
# Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
|
||||
export GOFLAGS=
|
||||
# Ensure sort order doesn't depend on locale
|
||||
|
@ -50,8 +50,8 @@ mkdir -p "${_kubetmp}"
|
||||
git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -)
|
||||
_kubetmp="${_kubetmp}/kubernetes"
|
||||
|
||||
# Do all our work with an unset GOPATH
|
||||
export GOPATH=
|
||||
# Do all our work in module mode
|
||||
export GO111MODULE=on
|
||||
|
||||
pushd "${_kubetmp}" > /dev/null 2>&1
|
||||
# Destroy deps in the copy of the kube tree
|
||||
|
Loading…
Reference in New Issue
Block a user