From f7b556a4dc5bcb08792079699129c817691d3847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 10 Nov 2020 11:39:54 +0100 Subject: [PATCH] Docs: Update bot docs --- .github/bot.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/bot.md b/.github/bot.md index 3a3b57812e9..7804f3b34c9 100644 --- a/.github/bot.md +++ b/.github/bot.md @@ -22,4 +22,9 @@ Metrics are configured in [metrics-collector.json](https://github.com/grafana/gr ## Backport PR +To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport `. Once merged grafanabot will automatically +try to cherry-pick the PR merge commit into that branch and open a PR. It will sync the milestone with the source PR so make sure the source PR also is assigned the milestone for the patch release. If the PR is already merged you can still add this label and trigger the backport automation. + +If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. + The backport logic is written [here](https://github.com/grafana/grafana-github-actions/blob/main/backport/backport.ts)