Skip to content

ci: retire auto-merge workflow - #136

Merged
smith-xyz merged 1 commit into
traust-security:developmentfrom
smith-xyz:chore/disable-automerge
Oct 30, 2026
Merged

smith-xyz merged 1 commit into
traust-security:developmentfrom
smith-xyz:chore/disable-automerge

Conversation

@smith-xyz

Copy link
Copy Markdown
Contributor

What

  • Deletes .github/workflows/auto-merge.yml — the pull_request_target workflow that armed GitHub's native auto-merge (the automerge label or a ticked test checkbox) so green PRs landed without a click
  • Drops the now-dead doc references

Why

Active development is cooling off and Qodo now handles code review, so the unattended-merge path is no longer worth a standing privileged trigger with a write token. Required checks still gate every merge — merging just needs a click again.

Notes

  • PRs already armed keep GitHub's native auto-merge setting; disable via the PR UI if one should not land unattended
  • The repo-level "Allow auto-merge" setting can be turned off separately once this merges

Active development is cooling off and Qodo covers review, so the
unattended-merge path is no longer worth a standing pull_request_target
workflow with a write token. Required checks still gate every merge -
they now just need a click.
@smith-xyz
smith-xyz requested a review from a team as a code owner October 30, 2026 18:40
@openshift-ci

openshift-ci Bot commented Oct 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smith-xyz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 30, 2026
@qodo-for-traust-security

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Powered by Qodo

@qodo-for-traust-security

Copy link
Copy Markdown

PR Summary by Qodo

Retire the auto-merge workflow

⚙️ Configuration changes 📝 Documentation 🕐 Less than 10 minutes


AI Description

• Remove the privileged workflow that armed unattended merges for eligible PRs.
• Require a manual merge after required checks pass, and update contributor guidance accordingly.
Diagram

graph TD
  PR["Pull request"] --> CI["Required checks"] --> Manual["Manual merge"] --> Dev["Development branch"]
Loading
High-Level Assessment

Deleting the workflow directly removes the standing privileged trigger and its unattended-merge behavior. Disabling auto-merge only at the repository level would leave the workflow in place; that setting can be turned off separately.

Files changed (1) +2 / -5

Documentation (1) +2 / -5
AGENTS.mdReplace auto-merge instructions with manual merge guidance +2/-5

Replace auto-merge instructions with manual merge guidance

• Removes instructions to arm auto-merge through a label or PR checkbox. Clarifies that contributors merge after checks pass and retain the merge-commit convention.

AGENTS.md

@smith-xyz
smith-xyz merged commit 779471d into traust-security:development Oct 30, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant