Consolidate auto-merge and mark PR commit status - #6
Merged
Conversation
- Remove the same-repo-only auto-merge job from ci.yml; Fork Auto Merge (workflow_run) is now the single merge path for both fork and maintainer PRs. - Fork Auto Merge runs a privileged test job and publishes a commit status on the PR head SHA, so the workflow_run result is linked to the PR and tracked with the other workflows. - Fork Test now records metadata first and uploads it with if: always() so a status can be posted even when tests fail. Co-Authored-By: Claude Opus 4.8 <[email protected]> Claude-Session: https://claude.ai/code/session_01GHWDrXhQK3GvjLBjuHsZth
netbirddev
approved these changes
Aug 22, 2026
An immediate gh pr merge fails with 'base branch policy prohibits the merge' when main has required checks/reviews still pending. --auto queues the PR and lets GitHub merge once requirements are met (and re-checks the current head, covering the TOCTOU concern). Requires 'Allow auto-merge' enabled in repo settings. Co-Authored-By: Claude Opus 4.8 <[email protected]> Claude-Session: https://claude.ai/code/session_01GHWDrXhQK3GvjLBjuHsZth
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
3 participants
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.
Claude-Session: https://claude.ai/code/session_01GHWDrXhQK3GvjLBjuHsZth