Skip to content

Commit

Permalink
chore: add 'v2' branch prefix as a mergify conditional (#10956)
Browse files Browse the repository at this point in the history
Two different mergify rules match the v2-main branch merge.
Include the branch base name as a conditional to keep them unique.
  • Loading branch information
Niranjan Jayakar authored Oct 20, 2020
1 parent 170551e commit 37dc9d8
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pull_request_rules:
commit_message: title+body
conditions:
- base!=release
- -base~=^v2
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge|no-squash|two-approvers)
- -merged
Expand All @@ -41,6 +42,7 @@ pull_request_rules:
commit_message: title+body
conditions:
- base!=release
- -base~=^v2
- -title~=(WIP|wip)
- label~=two-approvers
- -label~=(blocked|do-not-merge|no-squash)
Expand All @@ -64,6 +66,7 @@ pull_request_rules:
strict_method: merge
commit_message: title+body
conditions:
- -base~=^v2
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge)
# Only if no-squash is set
Expand Down Expand Up @@ -129,6 +132,7 @@ pull_request_rules:
strict_method: merge
commit_message: title+body
conditions:
- base=v2-main
- label~=forward-merge
- -label~=(blocked|do-not-merge)
- -merged
Expand Down

0 comments on commit 37dc9d8

Please sign in to comment.