debian-mirror-gitlab/doc/release/patch.md

82 lines
3.2 KiB
Markdown
Raw Normal View History

2014-09-02 18:07:02 +05:30
# Things to do when doing a patch release
2015-12-23 02:04:40 +05:30
NOTE: This is a guide for GitLab developers. If you are trying to install GitLab
see the latest stable [installation guide](install/installation.md) and if you
are trying to upgrade, see the [upgrade guides](update).
2014-09-02 18:07:02 +05:30
## When to do a patch release
2015-12-23 02:04:40 +05:30
Patch releases are done as-needed in order to fix regressions in the current
major release that cannot or should not wait until the next major release.
What's included and when to release is at the discretion of the release manager.
2014-09-02 18:07:02 +05:30
## Release Procedure
2015-12-23 02:04:40 +05:30
### Create a patch issue
Create an issue in the GitLab CE project. Name it "Release x.y.z", tag it with
the `release` label, and assign it to the milestone of the corresponding major
release.
Use the following template:
```
- Picked into respective `stable` branches:
- [ ] Merge `x-y-stable` into `x-y-stable-ee`
- [ ] release-tools: `x.y.z`
- gitlab-omnibus
- [ ] `x.y.z+ee.0`
- [ ] `x.y.z+ce.0`
- [ ] Deploy
- [ ] Add patch notice to [x.y regressions]()
- [ ] [Blog post]()
- [ ] [Tweet]()
- [ ] Add entry to version.gitlab.com
```
Update the issue with links to merge requests that need to be/have been picked
into the `stable` branches.
2015-04-26 12:48:37 +05:30
### Preparation
2014-09-02 18:07:02 +05:30
1. Verify that the issue can be reproduced
1. Note in the 'GitLab X.X regressions' that you will create a patch
1. Fix the issue on a feature branch, do this on the private GitLab development server
2015-04-26 12:48:37 +05:30
1. If it is a security issue, then assign it to the release manager and apply a 'security' label
2014-09-02 18:07:02 +05:30
1. Consider creating and testing workarounds
1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch
1. Make sure that the build has passed and all tests are passing
2015-04-26 12:48:37 +05:30
1. In a separate commit in the master branch update the CHANGELOG
1. For EE, update the CHANGELOG-EE if it is EE specific fix. Otherwise, merge the stable CE branch and add to CHANGELOG-EE "Merge community edition changes for version X.X.X"
1. Merge CE stable branch into EE stable branch
### Bump version
Get release tools
```
git clone git@dev.gitlab.org:gitlab/release-tools.git
cd release-tools
```
Bump all versions in stable branch, even if the changes affect only EE, CE, or CI. Since all the versions are synced now,
it doesn't make sense to say upgrade CE to 7.2, EE to 7.3 and CI to 7.1.
Create release tag and push to remotes:
```
bundle exec rake release["x.x.x"]
```
2015-09-11 14:41:01 +05:30
## Release
2015-04-26 12:48:37 +05:30
2014-09-02 18:07:02 +05:30
1. [Build new packages with the latest version](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
2015-04-26 12:48:37 +05:30
1. Apply the patch to GitLab.com and the private GitLab development server
1. Apply the patch to ci.gitLab.com and the private GitLab CI development server
1. Create and publish a blog post, see [patch release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/patch_release_blog_template.md)
1. Send tweets about the release from `@gitlab`, tweet should include the most important feature that the release is addressing and link to the blog post
2014-09-02 18:07:02 +05:30
1. Note in the 'GitLab X.X regressions' issue that the patch was published (CE only)
2015-09-11 14:41:01 +05:30
1. Create the 'x.y.0' version on version.gitlab.com
2015-04-26 12:48:37 +05:30
1. [Create new AMIs](https://dev.gitlab.org/gitlab/AMI/blob/master/README.md)
2015-12-23 02:04:40 +05:30
1. Create a new patch release issue for the next potential release