Merge pull request #1542 from justinsb/more_robust_apidiff

chore: make apidiff test more robust and informative

Author: k8s-ci-robot

hack/verify-apidiff

@@ -33,9 +33,14 @@ apidiffs=$(go run github.com/joelanford/[email protected] ${APIDIFF_OLD_COMMIT}
 filtered=$(echo "$apidiffs" | grep -E 'cluster-api-provider-gcp/(api/|exp/api/)' || true)
 
 if [[ -n "$filtered" ]]; then
-  echo "API differences found in api/ or exp/api/:"
+  echo "API differences found in api/ or exp/api/ packages."
+  echo ""
+  echo "Full set of differences found by go-apidiff:"
   echo "$apidiffs"
   exit 1
 else
-  echo "No differences found in api/ or exp/api/ packages"
+  echo "No differences found in api/ or exp/api/ packages."
+  echo ""
+  echo "Full set of differences found by go-apidiff:"
+  echo "$apidiffs"
 fi

scripts/ci-apidiff.sh

@@ -22,4 +22,4 @@ REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 cd "${REPO_ROOT}"
 
-APIDIFF_OLD_COMMIT="${PULL_BASE_SHA}" make apidiff
+APIDIFF_OLD_COMMIT="${PULL_BASE_SHA}" exec make apidiff