From 64b0c9ec4747c0597646bb44972d08550f9cce21 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 14 Jul 2017 14:02:21 -0700 Subject: [PATCH] Switch from gazel to kazel, and move kazelcfg into build/root --- .kazelcfg.json | 1 + .gazelcfg.json => build/root/.kazelcfg.json | 0 hack/update-bazel.sh | 17 +++-------------- hack/verify-bazel.sh | 18 +++--------------- 4 files changed, 7 insertions(+), 29 deletions(-) create mode 120000 .kazelcfg.json rename .gazelcfg.json => build/root/.kazelcfg.json (100%) diff --git a/.kazelcfg.json b/.kazelcfg.json new file mode 120000 index 0000000000000..cdc4e17bbb833 --- /dev/null +++ b/.kazelcfg.json @@ -0,0 +1 @@ +build/root/.kazelcfg.json \ No newline at end of file diff --git a/.gazelcfg.json b/build/root/.kazelcfg.json similarity index 100% rename from .gazelcfg.json rename to build/root/.kazelcfg.json diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh index 4bcfdf575fd83..24b204ca7058d 100755 --- a/hack/update-bazel.sh +++ b/hack/update-bazel.sh @@ -20,21 +20,10 @@ set -o pipefail export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -# Remove generated files prior to running gazel. +# Remove generated files prior to running kazel. # TODO(spxtr): Remove this line once Bazel is the only way to build. rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go" -go get -u gopkg.in/mikedanese/gazel.v17/gazel +kube::util::go_install_from_commit github.com/kubernetes/repo-infra/kazel fd3ec969104295f8484a32114ce625955a67365d -for path in ${GOPATH//:/ }; do - 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 - -"${gazel}" -root="$(kube::realpath ${KUBE_ROOT})" +kazel -root="$(kube::realpath ${KUBE_ROOT})" diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh index 7d94d1d935a95..979cb4aee590c 100755 --- a/hack/verify-bazel.sh +++ b/hack/verify-bazel.sh @@ -20,25 +20,13 @@ set -o pipefail export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -go get gopkg.in/mikedanese/gazel.v17/gazel - -# Remove generated files prior to running gazel. +# Remove generated files prior to running kazel. # TODO(spxtr): Remove this line once Bazel is the only way to build. rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go" -for path in ${GOPATH//:/ }; do - 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 - +kube::util::go_install_from_commit github.com/kubernetes/repo-infra/kazel fd3ec969104295f8484a32114ce625955a67365d -if ! "${gazel}" -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then +if ! kazel -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then echo echo "Run ./hack/update-bazel.sh" exit 1