Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
(cherry picked from commit df814cd)

# Conflicts:
#	.mergify.yml
  • Loading branch information
mergify[bot] committed Dec 18, 2024
1 parent 3cd9137 commit 7b29628
Showing 1 changed file with 24 additions and 13 deletions.
37 changes: 24 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
queue_rules:
- name: default
conditions:
- "#approved-reviews-by>2"

pull_request_rules:
- name: automerge to main if approved and labeled
conditions:
queue_conditions:
- "#approved-reviews-by>2"
- base=main
- label=automerge
actions:
queue:
name: default
method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_conditions:
- "#approved-reviews-by>2"
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
merge_method: squash

pull_request_rules:
- name: backport to v2
conditions:
- base=main
Expand All @@ -24,3 +20,18 @@ pull_request_rules:
backport:
branches:
- release/v2.x
<<<<<<< HEAD
=======
- name: backport to v3
conditions:
- base=main
- label=backport/3.x
actions:
backport:
branches:
- release/v3.x
- name: automerge to main if approved and labeled
conditions: []
actions:
queue:
>>>>>>> df814cd (ci(mergify): upgrade configuration to current format)

0 comments on commit 7b29628

Please sign in to comment.