Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(mergify): upgrade configuration to current format #239

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,32 @@ queue_rules:
queue_conditions:
- "label!=C-urgent"
- author!=dependabot[bot]
- and:
- "#review-threads-unresolved=0"
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "label!=do-not-merge"
- "label!=multiple-reviewers"
- "label!=mergify-ignore"
- "label!=M-do-not-merge"
- "label!=M-multiple-reviewers"
- "label!=M-mergify-ignore"
- "base=develop"
merge_conditions: []
merge_bot_account: OptimismBot
merge_method: merge
- name: lowpriority
queue_conditions:
- author=dependabot[bot]

pull_request_rules:
- name: Automatic merge on approval
conditions:
- and:
- "#review-threads-unresolved=0"
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "label!=do-not-merge"
- "label!=multiple-reviewers"
- "label!=mergify-ignore"
- "label!=M-do-not-merge"
- "label!=M-multiple-reviewers"
- "label!=M-mergify-ignore"
- "base=develop"
actions:
queue:
name: default
method: merge
merge_bot_account: OptimismBot
- name: Add merge train label
conditions:
- "queue-position >= 0"
actions:
comment:
message: |
This PR has been added to the merge queue, and will be merged soon.
message: |
This PR has been added to the merge queue, and will be merged soon.
label:
add:
- S-on-merge-train
Expand All @@ -51,7 +47,8 @@ pull_request_rules:
- conflict
actions:
comment:
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
message: Hey @{{author}}! This PR has merge conflicts. Please fix them before
continuing review.
label:
add:
- S-conflict
Expand Down Expand Up @@ -321,3 +318,7 @@ pull_request_rules:
label:
add:
- M-ci
- name: Automatic merge on approval
conditions: []
actions:
queue:
Loading