mirror of https://github.com/k3s-io/k3s
Merge pull request #36138 from saad-ali/fixGoDeps5
Ensure verify-godep passes godep to godep-savepull/6/head
commit
a6bea3d79b
|
@ -34,6 +34,7 @@ REQUIRED_BINS=(
|
|||
)
|
||||
|
||||
pushd "${KUBE_ROOT}" > /dev/null
|
||||
"${GODEP}" version
|
||||
GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}"
|
||||
# create a symlink in vendor directory pointing to the staging client. This
|
||||
# let other packages use the staging client as if it were vendored.
|
||||
|
|
|
@ -60,6 +60,7 @@ function cleanup {
|
|||
echo "Removing ${_tmpdir}"
|
||||
rm -rf "${_tmpdir}"
|
||||
fi
|
||||
export GODEP=""
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
|
@ -76,7 +77,7 @@ export GOPATH="${_tmpdir}"
|
|||
pushd "${_kubetmp}" 2>&1 > /dev/null
|
||||
# Build the godep tool
|
||||
go get -u github.com/tools/godep 2>/dev/null
|
||||
GODEP="${GOPATH}/bin/godep"
|
||||
export GODEP="${GOPATH}/bin/godep"
|
||||
pin-godep() {
|
||||
pushd "${GOPATH}/src/github.com/tools/godep" > /dev/null
|
||||
git checkout "$1"
|
||||
|
|
Loading…
Reference in New Issue