diff --git a/.gitlab/issue_templates/release.md b/.gitlab/issue_templates/release.md index 14a420781cfb331b2bf3fedde130cc373671ad0a..afa26177df67fb8c6101242cce80037b566dce3a 100644 --- a/.gitlab/issue_templates/release.md +++ b/.gitlab/issue_templates/release.md @@ -1,6 +1,6 @@ -# Release checklist: +# Release checklist -## Changes to do on the master branch before releasing +## In the master branch before releasing * [ ] Create a MR for the master branch for the following changes: * update/review `docs/*` and make sure it matches the current state @@ -10,23 +10,23 @@ instructions in `requirements.in` * [ ] update [CHANGELOG.md](https://keepachangelog.com/en/1.0.0/) * [ ] Include `Known issues` -* [ ] update the version number in the `VERSION` file -* [ ] commit (signed) +* [ ] Update the version number in the `VERSION` file +* [ ] Commit (signed) +* [ ] Push and make sure the pipeline succeeds for the last commit before tagging. This + is important because tags should not get retagged ! +* [ ] Create and push signed tag (`git tag -s 0.6.0 -m 'Release 0.6.0'; git push --tags`) * [ ] Push to MR * [ ] Wait for MR to get merged into master -## Changes to do in the new release branch +## In the new release branch -* [ ] If this is a major release, create a new release branch (i.e. `v0.5`) +* [ ] If this is a major release, create a new release branch (i.e. `v0.6`) Create a MR for the new branch with the following changes: -* [ ] Ensure all dependencies are updated and locked (locking should be done +* Ensure all dependencies are updated and locked (locking should be done only on the release branch): - * [ ] flux chart versions: `find flux/* -type f -exec yq -y -rS .spec.chart {} \;` -* [ ] Push and make sure the pipeline succeeds for the last commit before tagging. This - is important because tags should not get retagged ! -* [ ] Create and push signed tag (`git tag -s 0.2.0 -m 'Release 0.2.0'; git push --tags`) + * [ ] flux chart versions: `find flux2/* -type f -exec yq eval .spec.chart {} \;` * [ ] Wait for MR to get merged ## After release @@ -35,4 +35,5 @@ Create a MR for the new branch with the following changes: * [ ] Cherry-pick all changes from the release branch into master which shouldn't be only in the 0.4.0 branch (i.e. not the commit locking the dependencies) +* [ ] Create issue for creating a release blog post * [ ] Celebrate :clinking_glass: !!