Skip to content

fix: use --auto flag for merging PRs with branch protection #31

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
github-actions merged 1 commit into from
Mar 22, 2026
Merged

fix: use --auto flag for merging PRs with branch protection #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/workflow-merge-pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
fi

echo "Merging PR #$number with method $merge_method..."
gh pr merge "$number" -R "$REPO" "$merge_flag" --delete-branch --body "Merged automatically after successful CI."
gh pr merge "$number" -R "$REPO" "$merge_flag" --auto --delete-branch --body "Merged automatically after successful CI."

@chatgpt-codex-connector chatgpt-codex-connector Bot Mar 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Don't mark --auto PRs as merged before the merge happens

The GitHub CLI manual says gh pr merge --auto will merge "only after necessary requirements are met", so this command can succeed before the PR is actually on main. This workflow still sets merged_any=true immediately afterward, and .github/workflows/ci-pr.yml:74-114 uses that output to trigger workflow-compute-next-tag.yml and workflow-create-tag.yml, which check out main and tag its current HEAD. On protected branches where a required review/check is still pending, this will publish a tag/release from the pre-merge commit and report the PR as merged even if auto-merge never completes.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot Mar 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Avoid requiring repository auto-merge for every reusable caller

GitHub's auto-merge docs require auto-merge to be enabled at the repository level before a PR can use --auto. Because this reusable workflow now passes --auto unconditionally, any consumer repo that has not turned on the separate "Allow auto-merge" setting will fail here even when the PR is otherwise ready to merge. Since README.md:50-73 advertises this workflow for general reuse, this change is a breaking regression for callers that previously worked with the plain gh pr merge path.

Useful? React with 👍 / 👎.


merged_any="true"
entry=$(jq -n --arg number "$number" --arg head "$head" --arg title "$title" --arg author "$author" '{number:$number,head:$head,title:$title,author:$author}')
Expand Down
Loading