Skip to content

Commit

Permalink
mergify: fix mergify config
Browse files Browse the repository at this point in the history
Problem: The .mergify.yml had a line that was off by one space,
and thus could not be parsed as YAML.

Fix the invlalid YAML, also move some conditions back to
pull_request_rules.
  • Loading branch information
grondo committed Jan 18, 2022
1 parent 0cb1118 commit 12aea3b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ pull_request_rules:
- name: rebase and merge when passing all checks
conditions:
- base=master
- status-success="validate commits"
- label="merge-when-passing"
- label!="work-in-progress"
- "approved-reviews-by=@flux-framework/docs"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
actions:
- -title~=^\[*[Ww][Ii][Pp]
actions:
queue:
name: default
method: merge
Expand Down

0 comments on commit 12aea3b

Please sign in to comment.