Skip to content

ci: add Mergify configuration#11

Open
leseb wants to merge 1 commit intovllm-project:mainfrom
leseb:worktree-agent-abb969e2
Open

ci: add Mergify configuration#11
leseb wants to merge 1 commit intovllm-project:mainfrom
leseb:worktree-agent-abb969e2

Conversation

@leseb
Copy link
Copy Markdown
Collaborator

@leseb leseb commented Mar 24, 2026

Summary

  • Add .github/mergify.yml with rules for:
    • Ping author on conflicts and add needs-rebase label
    • Auto-remove needs-rebase label when conflict is resolved
    • Auto-update PRs that are 3+ commits behind main

Test Plan

  • Verify Mergify picks up the config after merge

Signed-off-by: Sébastien Han seb@redhat.com
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

@leseb
Copy link
Copy Markdown
Collaborator Author

leseb commented Mar 24, 2026

we need to enable mergify

Comment thread .github/mergify.yml Outdated
Add rules to ping authors on conflicts, manage the needs-rebase label,
and automatically update PRs that fall behind main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Signed-off-by: Sébastien Han <seb@redhat.com>
@leseb leseb force-pushed the worktree-agent-abb969e2 branch from bdb03cc to 2be2c7d Compare March 24, 2026 13:36
Copy link
Copy Markdown
Collaborator

@franciscojavierarceo franciscojavierarceo left a comment

Choose a reason for hiding this comment

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

I spent a little time with my clanker on this and here's a suggested setup:

pull_request_rules:
  - name: add needs-rebase label on conflicts
    conditions:
      - conflict
      - -closed
    actions:
      label:
        add:
          - needs-rebase

  - name: remove needs-rebase label when conflict is resolved
    conditions:
      - -conflict
      - -closed
    actions:
      label:
        remove:
          - needs-rebase

queue_rules:
  - name: default
    queue_conditions:
      - base=main
      - -draft
      - -conflict
      - "#approved-reviews-by>=1"
      - check-success=ci
    merge_conditions:
      - check-success=ci

priority_rules:
  - name: hotfix PRs go first
    conditions:
      - label=hotfix
    priority: high

  - name: high-priority PRs go ahead of normal PRs
    conditions:
      - label=high-priority
    priority: medium

And I believe we can use @mergifyio queue and @mergifyio dequeue, and we can add the hotfix or high-priority label when appropriate.

This also reduces all of the noise IMO.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants