Skip to content

chore: Change the breaking change detector to rebase and run the test against the rebased code #9284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hectorhammett wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Change the breaking change detector to rebase and run the test against the rebased code #9284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/release-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading