Skip to content

ci(pr-flow): add PR base guard — block stacked PRs #227

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
0xmariowu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci(pr-flow): add PR base guard — block stacked PRs #227

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
29 changes: 29 additions & 0 deletions .github/workflows/assert-base-is-default-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: PR base guard

# Reject PRs whose base is not the repo's default branch.
# Stacked PRs (PR-on-PR) are not supported here: under squash merge the
# downstream PR's base ref still points at the pre-squash commits, so the
# chain silently desyncs. Branch from the default branch and merge serially.

on:
pull_request:
types: [opened, reopened, edited, synchronize]

permissions: {}

jobs:
base-must-be-default:
runs-on: ubuntu-latest
steps:
- name: Reject if base is not the default branch
env:
BASE_REF: ${{ github.event.pull_request.base.ref }}
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
PR_NUMBER: ${{ github.event.pull_request.number }}
run: |
if [ "$BASE_REF" != "$DEFAULT_BRANCH" ]; then
echo "::error::PR #${PR_NUMBER} base is '${BASE_REF}', must be '${DEFAULT_BRANCH}'."
echo "Stacked PRs are not supported. Branch from '${DEFAULT_BRANCH}' and merge serially."
exit 1
fi
echo "OK: base '${BASE_REF}' matches default branch."
Loading