Skip to content

Commit

Permalink
Merge pull request #436 from flux-framework/mergify/configuration-dep…
Browse files Browse the repository at this point in the history
…recated-update

ci(mergify): upgrade configuration to current format
  • Loading branch information
grondo authored Dec 2, 2024
2 parents 0423b90 + 3412c1c commit c944ef6
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
queue_rules:
- name: default
conditions:
queue_conditions:
- base=master
- status-success="validate commits"
- status-success="make check"
- status-success="make linkcheck"
- label="merge-when-passing"
- label!="work-in-progress"
- "approved-reviews-by=@flux-framework/core"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
- -title~="^\[*(WIP|wip)"

pull_request_rules:
- name: rebase and merge when passing all checks
conditions:
merge_conditions:
- base=master
- status-success="validate commits"
- status-success="make check"
- status-success="make linkcheck"
- label="merge-when-passing"
- label!="work-in-progress"
- "approved-reviews-by=@flux-framework/core"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
- -title~="^\[*(WIP|wip)"
update_method: rebase
merge_method: merge

pull_request_rules:
- name: rebase and merge when passing all checks
conditions: []
actions:
queue:
name: default
method: merge
update_method: rebase

0 comments on commit c944ef6

Please sign in to comment.