From 1ee39f9fe23b142e2c064de3f97dc5fa6f399be9 Mon Sep 17 00:00:00 2001 From: hectorhammett Date: Fri, 19 Jun 2026 20:31:04 +0000 Subject: [PATCH 1/2] Change the breaking change detector to rebase and run the test agains the rebased code --- .github/workflows/release-checks.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-checks.yaml b/.github/workflows/release-checks.yaml index a28fcf43bb4..fd33bfe2319 100644 --- a/.github/workflows/release-checks.yaml +++ b/.github/workflows/release-checks.yaml @@ -18,11 +18,14 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "8.1" - - name: "Ensure that branch is up to date with main branch" + - name: "Rebase PR branch onto main branch" if: github.event.pull_request.user.login != 'release-please[bot]' run: | - if ! git merge-base --is-ancestor origin/main ${{ github.event.pull_request.head.sha }}; then - echo "PR branch is out of date with main. Please merge or rebase main into your branch to avoid false BC break detections." + git config user.name "Github Actions" + git config user.email "actions@github.com" + git checkout ${{ github.event.pull_request.head.sha }} + if ! git rebase origin/main; then + echo "Failed to rebase PR branch onto main. There may be conflicts. Please resolve conflicts or rebase manually." exit 1 fi - name: "Install dependencies" From 2e5c292c092da5c6af74a38e43b8f3142e13af1d Mon Sep 17 00:00:00 2001 From: hectorhammett Date: Tue, 23 Jun 2026 21:52:39 +0000 Subject: [PATCH 2/2] Remove unnecessary configuration for the breaking change detector --- .github/workflows/release-checks.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-checks.yaml b/.github/workflows/release-checks.yaml index fd33bfe2319..bb5f4f58e2a 100644 --- a/.github/workflows/release-checks.yaml +++ b/.github/workflows/release-checks.yaml @@ -21,9 +21,6 @@ jobs: - name: "Rebase PR branch onto main branch" if: github.event.pull_request.user.login != 'release-please[bot]' run: | - git config user.name "Github Actions" - git config user.email "actions@github.com" - git checkout ${{ github.event.pull_request.head.sha }} if ! git rebase origin/main; then echo "Failed to rebase PR branch onto main. There may be conflicts. Please resolve conflicts or rebase manually." exit 1