Skip to content

ci(auto-merge): add owner tier - #90

Merged
ANcpLua merged 1 commit into
mainfrom
add-owner-automerge-tier
May 4, 2026
Merged

ci(auto-merge): add owner tier#90
ANcpLua merged 1 commit into
mainfrom
add-owner-automerge-tier

Conversation

@ANcpLua

@ANcpLua ANcpLua commented May 4, 2026

Copy link
Copy Markdown
Owner

Summary

Adds an owner-auto-merge tier to the existing auto-merge workflow.

Why

The existing tiers fire only for Dependabot/Renovate/AI-bot accounts and CodeRabbit-approved PRs. PRs authored by the repo owner via the local `gh` CLI fall through every tier and have to be merged manually. This adds a 5th tier that enables `gh pr merge --auto --squash` whenever the PR author equals the repository owner — branch protection still gates the actual merge on required CI checks.

Test plan

  • Workflow parses
  • CI green
  • Future owner PRs auto-merge once CI passes

🤖 Generated with Claude Code

Owner-authored PRs now get auto-merge enabled on CI green —
matches the existing pattern for Dependabot, Renovate, AI bots,
and CodeRabbit. Branch protection still gates the merge on
required status checks.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 4, 2026 14:56
@coderabbitai

coderabbitai Bot commented May 4, 2026

Copy link
Copy Markdown

Caution

Review failed

Pull request was closed or merged during review

Summary by CodeRabbit

  • Chores
    • Enhanced pull request automation: non-draft pull requests created by the repository owner now automatically merge using the squash strategy.

Walkthrough

The workflow adds a new auto-merge tier for pull requests opened by the repository owner, enabling automatic squash-merge when CI passes on non-draft PRs.

Changes

Owner PR Auto-Merge

Layer / File(s) Summary
Workflow Documentation
.github/workflows/auto-merge.yml (lines 5–8)
Tier comments extended with "Owner PRs: Auto-merge when CI passes" entry.
Auto-Merge Job
.github/workflows/auto-merge.yml (lines 141–153)
New owner-auto-merge job triggers on non-draft PRs authored by repository owner and runs gh pr merge --auto --squash.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

area:infra

🚥 Pre-merge checks | ✅ 8
✅ Passed checks (8 passed)
Check name Status Explanation
Title check ✅ Passed Title follows conventional commits format with 'ci' type and 'auto-merge' scope, clearly summarizes the change (adding owner tier), and is 30 characters under the 72-character limit.
Description check ✅ Passed Description directly addresses the changeset by explaining the purpose, rationale, and test plan for the new owner-auto-merge tier in the workflow.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Otel Instrumentation Required ✅ Passed PR modifies only .github/workflows/auto-merge.yml; no C# service classes added.
No Unbounded Mcp Responses ✅ Passed PR modifies only .github/workflows/auto-merge.yml with no changes to MCP tool definitions, meeting the pass criterion.
Duckdb Backpressure On Write Paths ✅ Passed PR modifies only .github/workflows/auto-merge.yml; no DuckDB or database code paths introduced.
Cancellationtoken Threading ✅ Passed PR modifies only GitHub Actions workflow configuration; no C# source files or public async methods added.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Review rate limit: 3/5 reviews remaining, refill in 23 minutes and 48 seconds.

Comment @coderabbitai help to get the list of available commands and usage tips.

@ANcpLua
ANcpLua enabled auto-merge (squash) May 4, 2026 14:56
@ANcpLua
ANcpLua merged commit 5306045 into main May 4, 2026
11 of 12 checks passed
@ANcpLua
ANcpLua deleted the add-owner-automerge-tier branch May 4, 2026 14:57

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Adds a new “owner” tier to the repository’s auto-merge workflow so PRs opened by the repository owner can have auto-merge enabled automatically (still gated by branch protection / required checks).

Changes:

  • Add an “Owner auto-merge” job that enables gh pr merge --auto --squash for non-draft PRs authored by the repo owner.
  • Update the workflow’s tier list comment to include the owner tier.

owner-auto-merge:
name: Owner auto-merge
runs-on: ubuntu-latest
if: |
Comment on lines 5 to +8
# 1b. Renovate PRs: Auto-approve + auto-merge
# 2. AI Agent fix PRs (copilot/, jules/, claude/): Auto-merge when CI passes
# 3. CodeRabbit approved PRs: Auto-merge when CI passes
# 4. Owner PRs: Auto-merge when CI passes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants