Skip to content

N
nebula
Commit c79558b3 authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub
Browse files
Options

Merge pull request #2469 from mslipper/bugfix/mergify-dnm 

ci: Fix mergify config
parents 55dc75db a436d486
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 17 deletions
.github/mergify.yml
View file @ c79558b3
...@@ -5,24 +5,23 @@ queue_rules: ...@@ -5,24 +5,23 @@ queue_rules:
pull_request_rules: pull_request_rules:
- name: Automatic merge on approval - name: Automatic merge on approval
conditions: conditions:
and: - and:
- "#review-threads-unresolved=0"
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "label!=do-not-merge" - "label!=do-not-merge"
- and: - or:
- "#review-threads-unresolved=0" - and:
- "#approved-reviews-by>=2" - "label!=SR-Risk"
- "#changes-requested-reviews-by=0" - "label!=C-Protocol-Critical"
- or: - and:
- and: - "label=SR-Risk"
- "label!=SR-Risk" - "approved-reviews-by=maurelian"
- "label!=C-Protocol-Critical" - and:
- and: - "label=C-Protocol-Critical"
- "label=SR-Risk" - or:
- "approved-reviews-by=maurelian" - "approved-reviews-by=tynes"
- and: - "approved-reviews-by=smartcontracts"
- "label=C-Protocol-Critical"
- or:
- "approved-reviews-by=tynes"
- "approved-reviews-by=smartcontracts"
actions: actions:
queue: queue:
name: default name: default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment