From f220f3b5f9ab9f651634a94e4b0126b7820b79fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 10 Nov 2020 12:09:50 +0100 Subject: [PATCH] Docs: Another workflow docs update --- WORKFLOW.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/WORKFLOW.md b/WORKFLOW.md index fe6d07acfd0..6a45b0534c6 100644 --- a/WORKFLOW.md +++ b/WORKFLOW.md @@ -38,6 +38,12 @@ PRs MUST be [reviewed](https://help.github.com/en/github/collaborating-with-issu Once a PR is approved as per above, any team member MAY merge the PR. +## Backporting a PR + +PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/master/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. + +This backport process is also needed during a beta period to get fixes into the stable release. + # Release workflow ## Branch structure @@ -61,10 +67,6 @@ Release branches MUST be split from the following branches. Security releases follow the same process but MUST be prepared in secret. Security releases MUST NOT include changes which are not related to the security fix. Normal release processes MUST accommodate the security release process. SECURITY.md MUST be followed. -PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/master/.github/bot.md) - -Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. - Releases follow the following cadence - MAJOR: Yearly - MINOR: Every 4-6 weeks