Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 22, 2024
1 parent d3de5b9 commit a027601
Showing 1 changed file with 33 additions and 25 deletions.
58 changes: 33 additions & 25 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
queue_rules:
- name: default
conditions:
# Conditions to get out of the queue (= merged)
- name: duplicated default from automatic merge for master when CI passes and trusted
comitter
queue_conditions:
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- "#commented-reviews-by=0"
- status-success=mypy
- status-success=lint
- status-success=test
- status-success=jslint


pull_request_rules:
- name: automatic merge dependency updates
conditions:
- base=master
- author=@PennyDreadfulMTG/automerge
- status-success=mypy
- status-success=lint
- status-success=test
- status-success=jslint
- author~=(pyup-bot|dependabot)
- -files~=^(!?.github/workflows/)
actions:
merge:
method: rebase
delete_head_branch: {}
- name: automatic merge for master when CI passes and approved
conditions:
- base=master
merge_conditions: []
merge_method: merge
- name: default
queue_conditions:
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
Expand All @@ -32,19 +30,29 @@ pull_request_rules:
- status-success=test
- status-success=jslint
- base=master
actions:
queue:
name: default
method: rebase
- name: automatic merge for master when CI passes and trusted comitter
merge_conditions:
# Conditions to get out of the queue (= merged)
- status-success=mypy
- status-success=lint
- status-success=test
- status-success=jslint
merge_method: rebase

pull_request_rules:
- name: automatic merge dependency updates
conditions:
- author=@PennyDreadfulMTG/automerge
- status-success=mypy
- status-success=lint
- status-success=test
- status-success=jslint
- base=master
- author~=(pyup-bot|dependabot)
- -files~=^(!?.github/workflows/)
actions:
merge:
method: rebase
delete_head_branch: {}
- name: automatic merge for master when CI passes and approved + automatic merge
for master when CI passes and trusted comitter
conditions: []
actions:
queue:
name: default
method: merge

0 comments on commit a027601

Please sign in to comment.