From a6f4192d0428becb4b5cc2f94f3b68ffbc1ece13 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 4 Feb 2024 12:01:47 -0700 Subject: [PATCH] ci(Mergify): Add initial config * For backport to iron and humble * Asking to fix conflicts * Deleting head branch after merge Signed-off-by: Ryan --- .github/.mergify.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/.mergify.yml diff --git a/.github/.mergify.yml b/.github/.mergify.yml new file mode 100644 index 000000000..1ba3b6a7a --- /dev/null +++ b/.github/.mergify.yml @@ -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