From 7d5acfb923bb6b0be42066b7496a9447228119db Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Mon, 14 Dec 2015 14:03:45 -0500 Subject: [PATCH] Pin godep to version 32 33, 34, 35 are all broken differently. https://github.com/tools/godep/issues/359 --- hack/verify-godeps.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index b98897c3d36..1a4961b2fa1 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -18,6 +18,12 @@ set -o errexit set -o nounset set -o pipefail +# release v33 fails because of godep: error restoring dep (github.com/google/btree): found packages btree (btree.go) and main (btree_mem.go) in /tmp/gopath.aSHREx/src/github.com/google/btree +# release v34 fails because godep save just hangs forever +# release v35 fails because of godep: error restoring dep (github.com/Sirupsen/logrus): Unable to find dependent package golang.org/x/sys/unix in context of /tmp/gopath.aSHREx/src/github.com/Sirupsen/logrus +# https://github.com/tools/godep/issues/359 +GODEP_RELEASE=v32 + #### HACK #### # Sometimes godep just can't handle things. This lets use manually put # some deps in place first, so godep won't fall over. @@ -53,10 +59,13 @@ function cleanup { } trap cleanup EXIT -# build the godep tool export GOPATH="${_tmpdir}" +# build the godep tool go get -u github.com/tools/godep 2>/dev/null -go install 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 GODEP="${_tmpdir}/bin/godep" # fill out that nice clean place with the kube godeps