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 #1396

Open
wants to merge 1 commit into
base: main
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
98 changes: 69 additions & 29 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
queue_rules:
- name: duplicated Auto merge (main) from Auto merge (feature branch)
queue_conditions:
- base=main
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=Coverage
- check-success=Format
- check-success=Copyright Notices
- check-success=Checks (clippy)
- check-success=Checks (parachain)
- check-success=Checks (standalone)
- check-success=Quick check benchmarks
- check-success=Test standalone build
- check-success=Test parachain build
- check-success=Fuzz
- label=s:accepted
- base!=main
merge_conditions: []
merge_method: squash
- name: Auto merge (main)
queue_conditions:
- base=main
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=Coverage
- check-success=Format
- check-success=Copyright Notices
- check-success=Checks (clippy)
- check-success=Checks (parachain)
- check-success=Checks (standalone)
- check-success=Quick check benchmarks
- check-success=Test standalone build
- check-success=Test parachain build
- check-success=Fuzz
- label=s:accepted
merge_conditions: []
merge_method: squash

pull_request_rules:
- name: Auto merge (main)
conditions:
Expand All @@ -20,8 +59,6 @@ pull_request_rules:
remove:
- s:in-progress
- s:review-needed
queue:
merge_method: squash
- name: Auto merge (feature branch)
conditions:
- base!=main
Expand All @@ -42,52 +79,55 @@ pull_request_rules:
remove:
- s:in-progress
- s:review-needed
queue:
merge_method: squash
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
label:
add:
- s:revision-needed
remove:
- s:accepted
- s:in-progress
- s:review-needed
comment:
message: This pull request is now in conflicts. Could you fix it @{{author}}?
🙏
label:
add:
- s:revision-needed
remove:
- s:accepted
- s:in-progress
- s:review-needed
- name: Set in-progress label after changes are pushed
conditions:
- commits[-1].author!=mergify[bot]
- commits[-1].date_committer>=0 days 00:01 ago
actions:
label:
add:
- s:in-progress
remove:
- s:accepted
- s:available
- s:blocked
- s:on-hold
- s:review-needed
- s:revision-needed
label:
add:
- s:in-progress
remove:
- s:accepted
- s:available
- s:blocked
- s:on-hold
- s:review-needed
- s:revision-needed
- name: Trigger CI after Mergify merged the base branch (fix merge queue)
conditions:
- commits[-1].author=mergify[bot]
- commits[-1].date_committer>=0 days 00:01 ago
- queue-position=0
actions:
label:
add:
- s:review-needed
label:
add:
- s:review-needed
- name: Remove CI trigger label
conditions:
- commits[-1].author=mergify[bot]
- label=s:review-needed
- queue-position=0
actions:
label:
remove:
- s:review-needed
label:
remove:
- s:review-needed

- name: Auto merge (feature branch) + Auto merge (main)
conditions: []
actions:
queue: