Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update release process doc to use the cherrypicker plugin for patch releases #3301

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Update release process doc to use the cherrypicker plugin for patch releases #3301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions tekton/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,18 @@ Sometimes we'll find bugs that we want to backport fixes for into previous relea
or discover things that were missing from a release that are required by upstream
consumers of a project. In that case we'll make a patch release. To make one:

1. Create a branch for the release named `release-<version number>.x`, e.g. [`release-v0.18.x`](https://github.com/tektoncd/dashboard/tree/release-v0.18.x)
and push it to the repo https://github.com/tektoncd/dashboard (you may need help from
[an OWNER](../OWNERS) with permission to push) if that release branch does not exist.
1. Use [git cherry-pick](https://git-scm.com/docs/git-cherry-pick) to cherry pick the
fixes from main into the release branch you have created (use `-x` to include
the original commit information).
1. On the PR for the change you want to backport add a comment:
```
/cherrypick <branch>
```
where `<branch>` is the target release branch.
For example, to backport a fix to v0.43.x:
```
/cherrypick release-v0.43.x-lts
```
This will create a new PR cherry picking the relevant change onto the target branch.
1. Review the PR as normal
1. Repeat steps above for any other changes to be backported
1. [Create an official release](#create-an-official-release) for the patch, with the
[patch version incremented](https://semver.org/)

Expand Down