Commit 37dda6c2 authored by Jeff Grafton's avatar Jeff Grafton

If we already have the right version of gazel installed, use it

parent b4c71b1f
...@@ -20,18 +20,17 @@ set -o pipefail ...@@ -20,18 +20,17 @@ set -o pipefail
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
git config http.https://gopkg.in.followRedirects true go get gopkg.in/mikedanese/gazel.v14/gazel
go get -u gopkg.in/mikedanese/gazel.v14/gazel
for path in ${GOPATH//:/ }; do for path in ${GOPATH//:/ }; do
if [[ -e "${path}/bin/gazel" ]]; then if [[ -e "${path}/bin/gazel" ]]; then
gazel="${path}/bin/gazel" gazel="${path}/bin/gazel"
break break
fi fi
done done
if [[ -z "${gazel:-}" ]]; then if [[ -z "${gazel:-}" ]]; then
echo "Couldn't find gazel on the GOPATH." echo "Couldn't find gazel on the GOPATH."
exit 1 exit 1
fi fi
"${gazel}" -root="$(kube::realpath ${KUBE_ROOT})" "${gazel}" -root="$(kube::realpath ${KUBE_ROOT})"
...@@ -20,10 +20,20 @@ set -o pipefail ...@@ -20,10 +20,20 @@ set -o pipefail
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
git config http.https://gopkg.in.followRedirects true go get gopkg.in/mikedanese/gazel.v14/gazel
go get -u gopkg.in/mikedanese/gazel.v14/gazel for path in ${GOPATH//:/ }; do
if ! "${GOPATH}/bin/gazel" -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then if [[ -e "${path}/bin/gazel" ]]; then
gazel="${path}/bin/gazel"
break
fi
done
if [[ -z "${gazel:-}" ]]; then
echo "Couldn't find gazel on the GOPATH."
exit 1
fi
if ! "${gazel}" -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then
echo echo
echo "Run ./hack/update-bazel.sh" echo "Run ./hack/update-bazel.sh"
exit 1 exit 1
......
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