diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index 4f8c60739f..d56c059762 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -48,7 +48,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}} if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \ ! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \ - ! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then + ! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/'; then exit 0 fi @@ -85,13 +86,8 @@ _kubetmp="${_kubetmp}/kubernetes" export GOPATH="${_tmpdir}" pushd "${_kubetmp}" 2>&1 > /dev/null - kube::util::ensure_godep_version v79 - - export GOPATH="${GOPATH}:${_kubetmp}/staging" - # Fill out that nice clean place with the kube godeps - echo "Starting to download all kubernetes godeps. This takes a while" - godep restore - echo "Download finished" + # Restore the Godeps into our temp directory + hack/godep-restore.sh # Destroy deps in the copy of the kube tree rm -rf ./Godeps ./vendor