Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format (#1731)
Browse files Browse the repository at this point in the history
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mergify[bot] authored Nov 27, 2024
1 parent 5b3f571 commit 11a1051
Showing 1 changed file with 23 additions and 7 deletions.
30 changes: 23 additions & 7 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
queue_rules:
- name: duplicated default from Automatic merge on approval
queue_conditions:
- "author~=^(pyup-bot|dependabot\\[bot\\])$"
- "-merged"
- "status-success=test (3.x, 12, py3-cov)"
- "status-success=test (3.x, 12, lint)"
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "label=ready to merge"
merge_conditions: []
merge_method: merge
- name: default
conditions:
queue_conditions:
- "author~=^(pyup-bot|dependabot\\[bot\\])$"
- "-merged"
- "status-success=test (3.x, 12, py3-cov)"
- "status-success=test (3.x, 12, lint)"
merge_conditions:
- "status-success=test (3.x, 12, py3-cov)"
- "status-success=test (3.x, 12, lint)"
merge_method: rebase

pull_request_rules:
- name: Dependency updater - automatic merge on CI passing
Expand All @@ -12,9 +29,6 @@ pull_request_rules:
- "status-success=test (3.x, 12, py3-cov)"
- "status-success=test (3.x, 12, lint)"
actions:
queue:
method: rebase
name: default
delete_head_branch: {}
- name: Dependency updater - flag for human review on coverage failing
conditions:
Expand Down Expand Up @@ -43,7 +57,9 @@ pull_request_rules:
- "#changes-requested-reviews-by=0"
- "label=ready to merge"
actions:
queue:
method: merge
name: default
delete_head_branch: {}
- name: Automatic merge on approval + Dependency updater - automatic merge on CI
passing
conditions: []
actions:
queue:

0 comments on commit 11a1051

Please sign in to comment.