Commit 76847b34 authored by Tomasz Maczukin's avatar Tomasz Maczukin 🌴

Merge branch 'improve-release-template' into 'master'

Improve and fix release checklist

See merge request gitlab-org/gitlab-runner!940
parents 37fb9a0c 04bc70b7
Pipeline #27777746 passed with stages
in 44 minutes and 54 seconds
......@@ -118,19 +118,21 @@ if the only RC version was the _RC1_ released near 7th day of month.
- [ ] merge all RCx CHANGELOG entries into release entry and commit
```bash
git add CHANGELOG.md; git commit -m "Update CHANGELOG for v{{.Major}}.{{.Minor}}.0
git add CHANGELOG.md && git commit -m "Update CHANGELOG for v{{.Major}}.{{.Minor}}.0" -S
```
- [ ] tag and push **v{{.Major}}.{{.Minor}}.0**:
```bash
git tag -s v{{.Major}}.{{.Minor}}.0 -m "Version v{{.Major}}.{{.Minor}}.0"; git push origin v{{.Major}}.{{.Minor}}.0
git tag -s v{{.Major}}.{{.Minor}}.0 -m "Version v{{.Major}}.{{.Minor}}.0" && git push origin {{.Major}}-{{.Minor}}-stable v{{.Major}}.{{.Minor}}.0
```
- [ ] checkout to `master` and merge `{{.Major}}-{{.Minor}}-stable` into `master` (only this one time, to update CHANGELOG.md and make the tag available for ./scripts/prepare-changelog-entries.rb in next stable release), push `master`:
```bash
git checkout master; git merge --no-ff {{.Major}}-{{.Minor}}-stable; git push
git checkout master; git merge --no-ff {{.Major}}-{{.Minor}}-stable
# check that the only changes are in CHANGELOG.md
git push
```
- [ ] Before 15:00 UTC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment