Skip to content

ci: drop --delete-branch from the changelog auto-merge #387

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

Merged
hokiepokedad2 merged 2 commits into from
Aug 5, 2026
+9 −1
Merged

ci: drop --delete-branch from the changelog auto-merge #387

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f98e8
ci: drop --delete-branch from the changelog auto-merge
hokiepokedad2 Aug 5, 2026
13a2833
Merge branch 'main' into ci/fix-changelog-merge-queue
hokiepokedad2 Aug 5, 2026
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
10 changes: 9 additions & 1 deletion .github/workflows/release-changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,18 @@ jobs:
--body "Automated changelog cut — approving the mechanical [Unreleased] → version promotion. Source entries were already reviewed on their own PRs."

# Squash-merge once the required checks pass (they run because the PR is app-authored).
#
# No --delete-branch: `main` uses a merge queue, and gh rejects the flag outright with
# "Cannot use `-d` or `--delete-branch` when merge queue enabled", failing the whole step.
# It was redundant anyway -- create-pull-request above already sets `delete-branch: true`,
# which removes the branch once the PR closes.
#
# --squash is likewise decorative now (gh warns "the merge strategy for main is set by the
# merge queue") but is kept so the intent still reads correctly if the queue is ever removed.
- name: Enable auto-merge
if: steps.cfg.outputs.has_app == 'true' && steps.cpr.outputs.pull-request-number
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
PR: ${{ steps.cpr.outputs.pull-request-number }}
run: |
gh pr merge "$PR" --squash --auto --delete-branch
gh pr merge "$PR" --squash --auto
Loading