From 2ee339b0236f19ea174c3d636195eeccf4ea38a8 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 29 May 2022 18:50:26 -0700 Subject: [PATCH] Simplify verify-cli-conventions; use new setup_env --- hack/verify-cli-conventions.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hack/verify-cli-conventions.sh b/hack/verify-cli-conventions.sh index bb8d29cb1fb..cd70aa58e62 100755 --- a/hack/verify-cli-conventions.sh +++ b/hack/verify-cli-conventions.sh @@ -25,16 +25,11 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::old::setup_env +kube::golang::new::setup_env -BINS=( - cmd/clicheck -) -make -C "${KUBE_ROOT}" WHAT="${BINS[*]}" +hack/make-rules/build.sh ./cmd/clicheck -clicheck=$(kube::util::find-binary "clicheck") - -if ! output=$($clicheck 2>&1) +if ! output=$(clicheck 2>&1) then echo "$output" echo