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

Revert "Pin godep to version 32" #18706

Merged
merged 2 commits into from
Jan 20, 2016
Merged

Revert "Pin godep to version 32" #18706

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2646b4c
Revert "Pin godep to version 32"
eparis Dec 15, 2015
4034b5d
Stop needlessly preloading
eparis Jan 5, 2016
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
16 changes: 2 additions & 14 deletions hack/verify-godeps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ set -o errexit
set -o nounset
set -o pipefail

# Lock this to a release that is known to work. We can bump this as needed.
GODEP_RELEASE=v45

#### HACK ####
# Sometimes godep just can't handle things. This lets use manually put
# some deps in place first, so godep won't fall over.
Expand Down Expand Up @@ -56,24 +53,15 @@ function cleanup {
}
trap cleanup EXIT

export GOPATH="${_tmpdir}"
# build the godep tool
export GOPATH="${_tmpdir}"
go get -u github.com/tools/godep 2>/dev/null
pushd "${_tmpdir}/src/github.com/tools/godep" > /dev/null
git checkout "${GODEP_RELEASE}" 2>/dev/null
go install github.com/tools/godep 2>/dev/null
popd > /dev/null
go install github.com/tools/godep 2>/dev/null
GODEP="${_tmpdir}/bin/godep"

# fill out that nice clean place with the kube godeps
echo "Starting to download all kubernetes godeps. This takes a while"

# Remove once either godep works properly or we bump docker version
preload-dep github.com/docker docker 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d

# Remove once either godep works properly or we bump camlistore deps
preload-dep github.com/camlistore camlistore 9868aa0f8d8a93ff0b30ff0de46cc351b6b88b30

"${GODEP}" restore
echo "Download finished"

Expand Down