ci: drop --delete-branch from the changelog auto-merge - #387
Merged
Conversation
The v2.12.0 release cut failed at "Enable auto-merge": X Cannot use `-d` or `--delete-branch` when merge queue enabled `main` gained a merge queue in #378/#379, and gh rejects the flag outright rather than ignoring it, so the step exited 1 and the whole workflow failed. The changelog PR itself was created and approved fine -- only the arming failed. The flag was redundant regardless: peter-evans/create-pull-request above already sets `delete-branch: true`, which removes the branch once the PR closes. --squash is kept even though the queue now dictates the merge strategy (gh warns about it) so the intent still reads correctly if the queue is ever removed.
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
1 participant
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.
The v2.12.0 release cut failed at the Enable auto-merge step:
maingained a merge queue in #378/#379.gh pr mergerejects--delete-branchoutright rather than ignoring it, so the step exited 1 and failed the whole workflow.The release itself was fine — v2.12.0 published, the image built and pushed, and the changelog PR (#386) was created and approved successfully. Only the final arming failed, leaving #386 sitting unmerged. I armed it by hand to unblock the release.
Fix
Drop the flag. It was redundant anyway:
peter-evans/create-pull-requestabove already setsdelete-branch: true, which removes the branch once the PR closes.--squashis kept even though the queue now dictates the merge strategy (gh warnsthe merge strategy for main is set by the merge queue), so the intent still reads correctly if the queue is ever removed.Note
This is fallout from enabling the merge queue, and it is the only occurrence — I grepped every workflow for
--delete-branchandrelease-changelog.yml:168was the solegh pr mergeuse.auto-merge-deps.ymlcallsgh pr merge --auto --squashwithout it, so Dependabot auto-merge was never affected.