From 84b215b112e5665cb6f5105069bd28b029be0602 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Fri, 20 Nov 2026 20:08:39 +0000 Subject: [PATCH] ci: diff breaking change detector against PR base branch --- .github/workflows/release-checks.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-checks.yaml b/.github/workflows/release-checks.yaml index f7f1320055e..bc6abc37377 100644 --- a/.github/workflows/release-checks.yaml +++ b/.github/workflows/release-checks.yaml @@ -27,11 +27,12 @@ jobs: if: github.event.pull_request.user.login != 'release-please[bot]' continue-on-error: ${{ contains(github.event.pull_request.body, 'BREAKING_CHANGE_REASON=') }} env: + BASE_REF: ${{ github.base_ref }} HAS_BC_LABEL: ${{ contains(github.event.pull_request.title, '!:') }} run: | ./dev/google-cloud component:breaking-changes \ - --base-ref="$(git merge-base origin/main HEAD)" \ - --expect-breaking-changes=${HAS_BC_LABEL} \ + --base-ref="$(git merge-base "origin/${BASE_REF:-main}" HEAD)" \ + --expect-breaking-changes="${HAS_BC_LABEL}" \ --ga-only # Ensure the release PR does not contain an unexpected (e.g. 2.0.0) major version release