From 24fb72f5499810aab1d0e81a01b3d8c64c4f626f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Thu, 31 Oct 2024 19:28:08 +0300 Subject: [PATCH] Use standalone crddiff tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c2fcca..be31251 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ UPTEST_LOCAL_CHANNEL = stable KUSTOMIZE_VERSION = v5.3.0 YQ_VERSION = v4.40.5 CROSSPLANE_VERSION = 1.14.6 +CRDDIFF_VERSION = v0.12.1 -include build/makelib/k8s_tools.mk @@ -216,7 +217,7 @@ e2e: local-deploy uptest # TODO: please move this to the common build submodule # once the use cases mature -crddiff: $(UPTEST) +crddiff: @$(INFO) Checking breaking CRD schema changes @for crd in $${MODIFIED_CRD_LIST}; do \ if ! git cat-file -e "$${GITHUB_BASE_REF}:$${crd}" 2>/dev/null; then \ @@ -224,7 +225,7 @@ crddiff: $(UPTEST) continue ; \ fi ; \ echo "Checking $${crd} for breaking API changes..." ; \ - changes_detected=$$($(UPTEST) crddiff revision --enable-upjet-extensions <(git cat-file -p "$${GITHUB_BASE_REF}:$${crd}") "$${crd}" 2>&1) ; \ + changes_detected=$$(go run github.com/upbound/uptest/cmd/crddiff@$(CRDDIFF_VERSION) revision --enable-upjet-extensions <(git cat-file -p "$${GITHUB_BASE_REF}:$${crd}") "$${crd}" 2>&1) ; \ if [[ $$? != 0 ]] ; then \ printf "\033[31m"; echo "Breaking change detected!"; printf "\033[0m" ; \ echo "$${changes_detected}" ; \