github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

stop clearing GOPATH in vendor scripts

Browse Source 
if unset, go defaults to $HOME/go, and fails if $GOROOT is also set to the same directory

we were only doing this to be doubly sure that only modules were being used.
just depend on export GO111MODULE=on for that.
This commit is contained in:
Jordan Liggitt 2019-04-12 12:52:58 -04:00
parent ca55432599
commit fb0cea22dc
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lint-dependencies.sh
View File

@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
# Explicitly opt into go modules, even though we're inside a GOPATH directory # Explicitly opt into go modules, even though we're inside a GOPATH directory
export GO111MODULE=on 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 # Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
export GOFLAGS= export GOFLAGS=
# Detect problematic GOPROXY settings that prevent lookup of dependencies # Detect problematic GOPROXY settings that prevent lookup of dependencies

2
hack/update-vendor.sh
View File

@ -23,8 +23,6 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
# Explicitly opt into go modules, even though we're inside a GOPATH directory # Explicitly opt into go modules, even though we're inside a GOPATH directory
export GO111MODULE=on 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 # Explicitly clear GOFLAGS, since GOFLAGS=-mod=vendor breaks dependency resolution while rebuilding vendor
export GOFLAGS= export GOFLAGS=
# Ensure sort order doesn't depend on locale # Ensure sort order doesn't depend on locale

4
hack/verify-vendor.sh
View File

@ -63,8 +63,8 @@ mkdir -p "${_kubetmp}"
git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -) git archive --format=tar --prefix=kubernetes/ "$(git write-tree)" | (cd "${_kubetmp}" && tar xf -)
_kubetmp="${_kubetmp}/kubernetes" _kubetmp="${_kubetmp}/kubernetes"
# Do all our work with an unset GOPATH # Do all our work in module mode
export GOPATH= export GO111MODULE=on
pushd "${_kubetmp}" > /dev/null 2>&1 pushd "${_kubetmp}" > /dev/null 2>&1
# Destroy deps in the copy of the kube tree # Destroy deps in the copy of the kube tree