From 195916fa32b4f53f6f6e139d7f80d7950187ce66 Mon Sep 17 00:00:00 2001 From: Marko Date: Fri, 12 Feb 2021 14:06:28 +0000 Subject: [PATCH] backports: mergify (#6107) Co-authored-by: Tess Rinearson --- .github/mergify.yml | 8 ++++++++ CONTRIBUTING.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index b1bef433d..df570504a 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -8,3 +8,11 @@ pull_request_rules: method: squash strict: true commit_message: title+body + - name: backport patches to v0.34.x branch + conditions: + - base=master + - label=S:backport-to-v0.34.x + actions: + backport: + branches: + - v0.34.x diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26c47ac66..acaa44867 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -289,6 +289,8 @@ the backport branches have names like `v0.34.x` or `v0.33.x` (literally, `x`; it As non-breaking changes land on `master`, they should also be backported (cherry-picked) to these backport branches. +We use Mergify's [backport feature](https://mergify.io/features/backports) to automatically backport to the needed branch. Depending on which backport branch you need to backport to there will be labels for them. To notify the bot to backport a pull request, mark the pull request with the label `backport-to-`. Once the original pull request is merged, the bot will try to cherry-pick the pull request to the backport branch. If the bot fails to backport, it will open a pull request. The author of the original pull request is responsible for solving the conflicts and merging the pull request. + Minor releases don't have release candidates by default, although any tricky changes may merit a release candidate. To create a minor release: