diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-06-09 09:12:52 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-06-09 09:12:52 +0300 |
| commit | c3bb333b54bc8e1ae2d29982ebc758ccb92267b1 (patch) | |
| tree | 7790b0dc05847755bb044a2b0a38f025e748caa9 /.gitlab | |
| parent | 0e711de3bdff83d19738ad18f50a18ef8deb6fff (diff) | |
Update the release issue template to reflect new changelog process
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/release.md | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/.gitlab/issue_templates/release.md b/.gitlab/issue_templates/release.md index 9bfd7c7f..5c826ff1 100644 --- a/.gitlab/issue_templates/release.md +++ b/.gitlab/issue_templates/release.md @@ -1,20 +1,12 @@ - [ ] Set the milestone on this issue -- [ ] Review the list of changes since the last release and fill below: - - [ ] **In the changelog** - - [ ] **Not in the changelog** - - Hint: - ``` - git --no-pager log --merges --pretty=oneline master...vX.Y.Z - ``` - Decide on the version number by reference to the [Versioning](https://gitlab.com/gitlab-org/gitlab-pages/blob/master/PROCESS.md#versioning) * Typically if you want to release code from current `master` branch you will update `MINOR` version, e.g. `1.12.0` -> `1.13.0`. In that case you **don't** need to create stable branch * If you want to backport some bug fix or security fix you will need to update stable branch `X-Y-stable` - [ ] Create an MR for [gitlab-pages project](https://gitlab.com/gitlab-org/gitlab-pages). You can use [this MR](https://gitlab.com/gitlab-org/gitlab-pages/merge_requests/217) as an example. - - [ ] Update `VERSION` - - [ ] Update `CHANGELOG`, you can run `make changelog` once you have pushed your branch to the remote server + - [ ] Update `VERSION`, and push your branch + - [ ] Update `CHANGELOG` by running `GITLAB_PRIVATE_TOKEN= BRANCH= make changelog`, note that you need to create a personal access token - [ ] Assign to reviewer - [ ] Once `gitlab-pages` is merged create a signed+annotated tag pointing to the **merge commit** on the **stable branch** In case of `master` branch: @@ -50,15 +42,4 @@ - [ ] Create a changelog entry - [ ] Assign to a reviewer -### In the changelog -``` -- some change -- some change -``` -### Not in the changelog -``` -- some change -- some change -``` - /label ~backend ~"Category:Pages" ~"devops::release" ~"group::release" ~"feature::maintenance" |