Repository navigation
CI: rebased-on-main check for main's branch protection - #16
Merged
Merged
Conversation
Adds the status check that main's branch protection requires. Together with "require branches to be up to date", a PR that is behind main can't merge until it is rebased.
allsmog
force-pushed
the
ci/rebased-on-main
branch
from
October 23, 2026 16:26
5787979 to
0b78a38
Compare
Collaborator
|
Merged without an approving review; per the founder it stays merged. Follow-ups are in LIM-2441 (https://linear.app/liminal-space-io/issue/LIM-2441): (1) it doesn't enforce a rebase, so a branch that merges main in passes; turn on required linear history or reject merge commits in |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds
.github/workflows/rebased-on-main.yml, a check that passes only when the PR contains the current tip of its base branch.Main's branch protection now requires this check and requires branches to be up to date before merging, with admins included. Once this lands, a PR that falls behind main can't merge until it is rebased onto main (the PR page's "Update branch" button offers "Update with rebase").
Until this PR merges, nothing can merge into main, since the required check doesn't exist on main yet. This PR runs the check on itself, so it can pass and be merged first.
Open PRs (#10, #14, #15, and #11/#13 once retargeted) need one rebase onto main after this lands so the check runs on them.