apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Like Prometheus, but for logs.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
6340 Commits
1064 Branches
354 Tags
714 MiB
 
 
 
 
 
 
Tag: Branch: Tree: 36e3d7ea61
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '36e3d7ea61'
${ noResults }
loki/docs/sources/community/maintaining/release/backport-commits.md

1.3 KiB
Raw Blame History

title description
Backport commits Backport commits

Backport commits

Any PRs or commits not on the release branch that you want to include in the release must be backported to the release branch.

Before you begin

  1. Determine the [VERSION_PREFIX]({{< relref "./concepts/version" >}}).

  2. If the release branch already has all the code changes on it, skip this step.

Steps

  1. Pick a PR that you want to backport to release-VERSION_PREFIX branch.

  2. Add two labels to the PR. First, one of the product-approved, type/doc or type/bug appropriately. This is to make sure the PRs that are backported are done with right intention. Second backport release-VERSION_PREFIX label. Now CI should automatically create backport PR to the correct release branch. Example PR

    {{% admonition type="note" %}} CI automation can fail sometimes if there are some merge conflicts in cherry picking the commits. In those cases, the original PR where you added the label should have additional comment explaining how to backport it manually. {{% /admonition %}}

    {{% admonition type="note" %}} The CI job that helps with backporting PR is .github/workflows/backport.yml. Useful for debugging purposes. {{% /admonition %}}

  3. Repeat the above steps for any PRs that need to be backported.