Skip to content

Commit

Permalink
Adjust mergify status checks and label management (#1042)
Browse files Browse the repository at this point in the history
* Fix status name in check-success

Also removes the condition that the base branch must be main

* Change status labels in case a conflict is detected
  • Loading branch information
sea212 authored Jul 18, 2023
1 parent 4f84b01 commit 38c73c5
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
pull_request_rules:
- name: Auto merge
conditions:
- base=main
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=format
- check-success=tests
- check-success=fuzz
- check-success=benchmark
- check-success=Coverage / Coverage
- check-success=Rust / Format
- check-success=Rust / Copyright Notices
- check-success=Rust / Checks (clippy)
- check-success=Rust / Checks (parachain)
- check-success=Rust / Checks (standalone)
- check-success=Rust / Quick check benchmarks
- check-success=Rust / Test standalone build
- check-success=Rust / Test parachain build
- check-success=Rust / Fuzz
- label=s:accepted
actions:
label:
Expand All @@ -22,4 +27,11 @@ pull_request_rules:
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

0 comments on commit 38c73c5

Please sign in to comment.