Skip to content

Commit 7e0ce0c

Browse files
authored
Merge pull request #4797 from nojnhuh/apidiff
update go-apidiff
2 parents 214c107 + 1a19641 commit 7e0ce0c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ KPROMO_VER := v4.0.4
101101
KPROMO_BIN := kpromo
102102
KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
103103

104-
GO_APIDIFF_VER := v0.7.0
104+
GO_APIDIFF_VER := v0.8.2
105105
GO_APIDIFF_BIN := go-apidiff
106106
GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)
107107

scripts/ci-apidiff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cd "${REPO_ROOT}" || exit
2424
echo "*** Running go-apidiff ***"
2525
APIDIFF=$(APIDIFF_OLD_COMMIT="${PULL_BASE_SHA}" make apidiff 2> /dev/null)
2626

27-
if [[ "${APIDIFF}" == *"sigs.k8s.io/cluster-api-provider-azure/api/"* ]] || [[ "${APIDIFF}" == *"sigs.k8s.io/cluster-api-provider-azure/exp/api/"* ]]; then
27+
if grep -qE '^sigs\.k8s\.io/cluster-api-provider-azure/(exp/)?api/' <<< "$APIDIFF"; then
2828
echo "${APIDIFF}"
2929
exit 1
3030
else

0 commit comments

Comments
 (0)