Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure verify-godep passes godep to godep-save #36138

Merged
merged 1 commit into from Nov 3, 2016
Merged

Ensure verify-godep passes godep to godep-save #36138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions hack/godep-save.sh
View file
Open in desktop
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion hack/verify-godeps.sh
View file
Open in desktop
Expand Up @@ -60,6 +60,7 @@ function cleanup {
echo "Removing ${_tmpdir}"
rm -rf "${_tmpdir}"
fi
export GODEP=""
}
trap cleanup EXIT

Expand All @@ -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"
Expand Down