Repository navigation
fix: request auto-merge without --delete-branch under a merge queue - #6
Conversation
gh refuses --delete-branch when the base branch has a merge queue, so the workflow failed on every new sqlbuild pull request. Ask for branch deletion only when there is no queue; with one, the repository's delete-on-merge setting removes the branch.
|
Follow-up check on sqlstack-io/sqlbuild#1566: the workflow did not request auto-merge on
The |
|
Follow-up on why This workflow runs as a ruleset-required workflow, and GitHub ignores the So the Seen twice in sqlstack-io/sqlbuild:
The agreed practice stays: whoever marks a draft ready enables auto-merge by hand with |
|
Another merge-queue interaction, this time with the Release Please pull request. When a commit lands on main while the release pull request is in the merge queue, Release Please cannot update the release branch. Seen in sqlstack-io/sqlbuild:
We let it merge, since dequeuing costs a full queue cycle, and left the release notes and CHANGELOG.md as generated. Options if this keeps happening: hold other pull requests out of the queue while a release pull request is queued, or have the release merge step dequeue and re-request the release pull request when a Release Please run fails to update its branch. |
gh refuses
--delete-branchwhen the base branch has a merge queue ("Cannot use -d or --delete-branch when merge queue enabled"), so Request Auto-Merge failed on sqlbuild#1421, the first new pull request since sqlbuild's queue went on.The step now asks GitHub whether the base branch has a merge queue and passes
--delete-branchonly when it doesn't. Repositories with a queue (sqlbuild, sqlquack) have delete-on-merge on, so their branches are still removed. Repositories without one keep today's behaviour, which matters because several (sqlclean, sqlload, sqlquack-evidence) don't have delete-on-merge on.Checked: actionlint, and the GraphQL query run against sqlbuild and sqlquack (queue, no flag) and sqlclean (no queue, flag kept). The live test is the next new sqlbuild pull request.