Skip to content

Commit 64b0c9e

Browse files
committedJul 18, 2017
Switch from gazel to kazel, and move kazelcfg into build/root
1 parent 9ac0950 commit 64b0c9e

File tree

4 files changed

+7
-29
lines changed

4 files changed

+7
-29
lines changed
 

‎.kazelcfg.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/root/.kazelcfg.json
File renamed without changes.

‎hack/update-bazel.sh

+3-14
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,10 @@ set -o pipefail
2020
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
2121
source "${KUBE_ROOT}/hack/lib/init.sh"
2222

23-
# Remove generated files prior to running gazel.
23+
# Remove generated files prior to running kazel.
2424
# TODO(spxtr): Remove this line once Bazel is the only way to build.
2525
rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"
2626

27-
go get -u gopkg.in/mikedanese/gazel.v17/gazel
27+
kube::util::go_install_from_commit github.com/kubernetes/repo-infra/kazel fd3ec969104295f8484a32114ce625955a67365d
2828

29-
for path in ${GOPATH//:/ }; do
30-
if [[ -e "${path}/bin/gazel" ]]; then
31-
gazel="${path}/bin/gazel"
32-
break
33-
fi
34-
done
35-
if [[ -z "${gazel:-}" ]]; then
36-
echo "Couldn't find gazel on the GOPATH."
37-
exit 1
38-
fi
39-
40-
"${gazel}" -root="$(kube::realpath ${KUBE_ROOT})"
29+
kazel -root="$(kube::realpath ${KUBE_ROOT})"

‎hack/verify-bazel.sh

+3-15
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,13 @@ set -o pipefail
2020
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
2121
source "${KUBE_ROOT}/hack/lib/init.sh"
2222

23-
go get gopkg.in/mikedanese/gazel.v17/gazel
24-
25-
# Remove generated files prior to running gazel.
23+
# Remove generated files prior to running kazel.
2624
# TODO(spxtr): Remove this line once Bazel is the only way to build.
2725
rm -f "${KUBE_ROOT}/pkg/generated/openapi/zz_generated.openapi.go"
2826

29-
for path in ${GOPATH//:/ }; do
30-
if [[ -e "${path}/bin/gazel" ]]; then
31-
gazel="${path}/bin/gazel"
32-
break
33-
fi
34-
done
35-
if [[ -z "${gazel:-}" ]]; then
36-
echo "Couldn't find gazel on the GOPATH."
37-
exit 1
38-
fi
39-
27+
kube::util::go_install_from_commit github.com/kubernetes/repo-infra/kazel fd3ec969104295f8484a32114ce625955a67365d
4028

41-
if ! "${gazel}" -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then
29+
if ! kazel -validate -print-diff -root="$(kube::realpath ${KUBE_ROOT})" ; then
4230
echo
4331
echo "Run ./hack/update-bazel.sh"
4432
exit 1

0 commit comments

Comments
 (0)