Skip to content

Commit

Permalink
ci(Mergify): Add initial config
Browse files Browse the repository at this point in the history
* For backport to iron and humble
* Asking to fix conflicts
* Deleting head branch after merge

Signed-off-by: Ryan <[email protected]>
  • Loading branch information
Ryanf55 committed Feb 4, 2024
1 parent 46e4511 commit a6f4192
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions .github/.mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
pull_request_rules:
- name: backport to iron at reviewers discretion
conditions:
- base=rolling
- label=backport-iron
actions:
backport:
branches:
- iron

- name: backport to humble at reviewers discretion
conditions:
- base=rolling
- label=backport-humble
actions:
backport:
branches:
- humble

- name: delete head branch after merge
conditions:
- merged
actions:
delete_head_branch:

- name: ask to resolve conflict
conditions:
- conflict
- author!=mergify
actions:
comment:
message: This pull request is in conflict. Could you fix it @{{author}}?

# TODO enable automatic merge of backports
# https://docs.mergify.com/workflow/actions/backport/#combining-automatic-merge

0 comments on commit a6f4192

Please sign in to comment.