Merge pull request #2597 from k8s-infra-cherrypick-robot/cherry-pick-2567-to-release-1.4

[release-1.4] Apidiff test runs only if the changes are in api/ and exp/api/

Author: k8s-ci-robot

Makefile

@@ -213,9 +213,11 @@ clean-temporary: ## Remove all temporary files and folders.
 clean-release: ## Remove the release folder.
 	rm -rf $(RELEASE_DIR)
 
+APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
+
 .PHONY: apidiff
 apidiff: $(GO_APIDIFF) ## Check for API differences.
-	$(GO_APIDIFF) $(shell git rev-parse origin/main) --print-compatible
+	$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT)
 
 .PHONY: format-tiltfile
 format-tiltfile: ## Format the Tiltfile.

scripts/ci-apidiff.sh

@@ -14,15 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -o errexit
 set -o nounset
 set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-APIDIFF="${REPO_ROOT}/hack/tools/bin/go-apidiff"
+cd "${REPO_ROOT}" || exit
 
-make --directory="${REPO_ROOT}" "${APIDIFF##*/}"
 echo "*** Running go-apidiff ***"
+APIDIFF=$(APIDIFF_OLD_COMMIT="${PULL_BASE_SHA}" make apidiff 2> /dev/null)
 
-${APIDIFF} "${PULL_BASE_SHA}" --print-compatible
+if [[ "${APIDIFF}" == *"sigs.k8s.io/cluster-api-provider-azure/api/"* ]] || [[ "${APIDIFF}" == *"sigs.k8s.io/cluster-api-provider-azure/exp/api/"* ]]; then
+    echo "${APIDIFF}"
+    exit 1
+else
+    echo "No files under api/ or exp/api/ changed."
+fi

scripts/go_install.sh

@@ -37,7 +37,7 @@ if [ -z "${GOBIN}" ]; then
   exit 1
 fi
 
-rm "${GOBIN}/${2}"* || true
+rm "${GOBIN}/${2}"* 2> /dev/null || true
 
 # install the golang module specified as the first argument
 go install -tags tools "${1}@${3}"