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 10f26ff commit fbe1302
Showing 1 changed file with 22 additions and 8 deletions.
30 changes: 22 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
queue_rules:
- name: duplicated default from backport patches to 1.8
queue_conditions:
- base=master
- label=backport 1.8
- merged
merge_conditions: []
update_method: rebase
- name: default
merge_conditions:
- base=master
- label=backport 1.6
- merged
update_method: rebase

pull_request_rules:
# For more information: https://doc.mergify.io/actions.html#copy
# We used to use the 'backport' action, but:
Expand All @@ -9,7 +24,7 @@ pull_request_rules:
- merged
actions:
copy:
ignore_conflicts: True
ignore_conflicts: true
branches:
- "1.2"

Expand All @@ -20,7 +35,7 @@ pull_request_rules:
- merged
actions:
copy:
ignore_conflicts: True
ignore_conflicts: true
branches:
- "1.4"

Expand All @@ -31,21 +46,20 @@ pull_request_rules:
- merged
actions:
copy:
ignore_conflicts: True
ignore_conflicts: true
branches:
- "1.6"
queue:
update_method: rebase

- name: backport patches to 1.8
conditions:
- base=master
- label=backport 1.8
- merged
actions:
copy:
ignore_conflicts: True
ignore_conflicts: true
branches:
- "1.8"
- name: backport patches to 1.6 + backport patches to 1.8
conditions: []
actions:
queue:
update_method: rebase

0 comments on commit fbe1302

Please sign in to comment.