From 430dda52ad9d9d79e28d5ba298f84a6857d69b8b Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Fri, 14 Oct 2022 16:24:14 +1100 Subject: [PATCH 1/2] Add mergify configuration --- .github/mergify.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/mergify.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000000..107cb9d1703 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,28 @@ +defaults: + actions: + queue: + method: squash + commit_message_template: | + {{ title }} (#{{ number }}) + + {{ body | get_section("## Commit Message body", "") }} + +pull_request_rules: + - name: Ask to resolve conflict + conditions: + - conflict + - -draft # Draft PRs are allowed to have conflicts. + actions: + comment: + message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏 + + - name: Add to merge queue + conditions: + # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection + - label=send-it + actions: + queue: + +queue_rules: + - name: default + conditions: [] From f427d0173f4b1aea63e9b7c4e7dde0af619bb7bc Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Thu, 27 Oct 2022 11:08:38 +1100 Subject: [PATCH 2/2] Add commit message body section to template --- .github/pull_request_template.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7c28e9f668d..900c4d5cc3c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,3 +19,6 @@ - [ ] I have made corresponding changes to the documentation - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] A changelog entry has been made in the appropriate crates + + +## Commit message body