Skip to content

K
k3s
Commit 2646b4c9 authored by Eric Paris's avatar Eric Paris
Browse files
Options

Revert "Pin godep to version 32"

This reverts commit 7d5acfb9. This was hopefully fixed in https://github.com/tools/godep/pull/362
parent ee006e76
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
hack/verify-godeps.sh
View file @ 2646b4c9
...@@ -18,9 +18,6 @@ set -o errexit ...@@ -18,9 +18,6 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
# Lock this to a release that is known to work. We can bump this as needed.
GODEP_RELEASE=v45
#### HACK #### #### HACK ####
# Sometimes godep just can't handle things. This lets use manually put # Sometimes godep just can't handle things. This lets use manually put
# some deps in place first, so godep won't fall over. # some deps in place first, so godep won't fall over.
...@@ -56,13 +53,10 @@ function cleanup { ...@@ -56,13 +53,10 @@ function cleanup {
} }
trap cleanup EXIT trap cleanup EXIT
export GOPATH="${_tmpdir}"
# build the godep tool # build the godep tool
export GOPATH="${_tmpdir}"
go get -u github.com/tools/godep 2>/dev/null go get -u github.com/tools/godep 2>/dev/null
pushd "${_tmpdir}/src/github.com/tools/godep" > /dev/null go install github.com/tools/godep 2>/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" GODEP="${_tmpdir}/bin/godep"
# fill out that nice clean place with the kube godeps # fill out that nice clean place with the kube godeps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment