Repository navigation
automation: allow landing an approved rebase by hand - #50
Merged
Merged
Conversation
GitHub starts no workflow for a review of a pull request it cannot compute a merge ref for, and a rebase often conflicts with the tree it replaces: approving #48 started nothing, and it had to be landed by hand. The land workflow can now also be run with a pull request number. It then reads the head, branch and base from the pull request, requires the same rebase/edera-mainline/... branch into edera/mainline, and lands on the most recent approval of the current head from a reviewer whose latest review is still an approval. Everything after that, the write-access check, the tip check, the backup and the leased push, is unchanged.
azenla
approved these changes
Oct 23, 2026
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.
Approving #48 started no land run: GitHub starts no workflow for a review of a pull request it cannot compute a merge ref for (#48 was
mergeable_state: dirty), and a rebase often conflicts with the tree it replaces. #48 had to be landed by hand.rebase-land.ymlnow also takesworkflow_dispatchwith aprinput:Run that way, it reads the head, branch and base from the pull request and requires an open
rebase/edera-mainline/...branch from this repository intoedera/mainline. The approver is the most recent approval of the current head from a reviewer whose latest review is still an approval; a later change request or dismissal cancels it. The write-access check, the tip check, the backup and the leased push are unchanged. The concurrency group is now fixed topush-edera/mainline, since a dispatch carries no pull request.Checked: the workflow parses and the
Landscript passesbash -n; the approval filter pickskaniinion #48's reviews and handles a later change request, an approval of an old head, a comment after an approval, and no reviews. Not yet run in Actions.edera/6.18-ltscarries its own copy of this workflow and is not changed here.