Repository navigation
ci: manual-merge-guard to prevent auto ship on main - #80
Merged
Merged
Conversation
Add a free-tier post-merge guard that detects non-compliant merges to main and automatically creates incident/rollback artifacts. This gives us a practical enforcement path when branch protection and rulesets are unavailable on private repositories. Key changes: - Add .github/workflows/manual-merge-guard.yml triggered on pull_request_target closed events for merged PRs to main. - Add scripts/ci/manual_merge_guard.py to classify merge compliance (independent approval required; self-merge blocked by default; allowlist + fail-open on API outage). - Add tests/unit/test_manual_merge_guard.py using Red->Green TDD for core decisions. - Update CONTRIBUTING.md, docs/governance/branch-protection.md, docs/guides/Team_Agent_Collab_Playbook.md, and .github/pull_request_template.md to codify manual approval workflow. Operational defaults: - Set repository variable MANUAL_MERGE_GUARD_MODE=alert-only for safe rollout. - Keep MANUAL_MERGE_GUARD_ALLOW_MERGERS unset by default (strict baseline).
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.
Summary
manual-merge-guardworkflow to enforce manual approval policy on merged PRs tomainscripts/ci/manual_merge_guard.pytests/unit/test_manual_merge_guard.py)Why
On current plan, private repo branch protection/rulesets are unavailable (403), so we need a free-tier guardrail to stop "PR opened then auto-shipped" behavior.
Policy enforced by fallback
mainmust have independentAPPROVEDreviewauthor == merged_by) is non-compliant by defaultRollout
MANUAL_MERGE_GUARD_MODE=alert-only(safe rollout)revert-prVerification
pytest -q tests/unit/test_manual_merge_guard.py=> 5 passedruff check scripts/ci/manual_merge_guard.py tests/unit/test_manual_merge_guard.py=> cleanpython -m compileall -q scripts/ci/manual_merge_guard.py tests/unit/test_manual_merge_guard.py=> success