From 0ae4dfbeab24a8611ba89367dfeda71f741ab514 Mon Sep 17 00:00:00 2001 From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com> Date: Wed, 3 Nov 2021 10:17:21 -0400 Subject: [PATCH] RELEASE GUIDE: fix formatting, add a clarification (#4230) --- RELEASE_GUIDE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE_GUIDE.md b/RELEASE_GUIDE.md index a2f7a6db32..896d0139f3 100644 --- a/RELEASE_GUIDE.md +++ b/RELEASE_GUIDE.md @@ -10,9 +10,9 @@ Lens releases are built by CICD automatically on git tags. The typical release p - `major` - `minor` - `patch` - - `premajor` [--preid=] - - `preminor` [--preid=] - - `prepatch` [--preid=] + - `premajor [--preid=]` + - `preminor [--preid=]` + - `prepatch [--preid=]` - `prerelease [--preid=]` where `` is generally one of: @@ -28,6 +28,8 @@ Lens releases are built by CICD automatically on git tags. The typical release p - `git tag -fa vX.Y.Z-beta.N` (move the tag locally to the current commit) - `git push origin --tags` (update the tags on https://github.com/lensapp/lens to reflect this local change) + Once the tag has been updated on origin (e.g. by `git push origin --tags`) the azure jobs are automatically triggered again. + 1. Once CI passes again go to the releases tab on GitHub. You can use the existing draft release prepared by k8slens-bot (select the correct tag). Or you can create a new release from the tag that was created, and make sure that the change log is the same as that of the PR, and the title is the tag. Either way, click the prerelease checkbox if this is not a new major, minor, or patch version before clicking `Publish release`. 1. Merge the release PR after the release is published. If it is a patch release then there is no need to squash the cherry-picked commits as part of the merge. GitHub should delete the branch once it is merged. 1. If you have just released a new major or minor version then create a new `release/vMAJOR.MINOR` branch from that same tag and push it to https://github.com/lensapp/lens. Given the commit of the merged release PR from the master branch you can do this like