Download as
Browse Code »

Commit 4147fc7eb62eb58fe33a9eea7b5450ae011b6e96

Authored by Marin Jankovski
1 parent 9e924c70
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Update patch release document.

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
doc/release/patch.md
  Diff comments   View file @4147fc7
@@ -17,14 +17,14 @@ Otherwise include it in the monthly release and note there was a regression fix @@ -17,14 +17,14 @@ Otherwise include it in the monthly release and note there was a regression fix
17 1. Fix the issue on a feature branch, do this on the private GitLab development server 17 1. Fix the issue on a feature branch, do this on the private GitLab development server
18 1. Consider creating and testing workarounds 18 1. Consider creating and testing workarounds
19 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch 19 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch
20 -1. In a separate commit in the stable branch update the VERSION  
21 1. In a separate commit in the stable branch update the CHANGELOG 20 1. In a separate commit in the stable branch update the CHANGELOG
22 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" 21 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"
23 -1. Create an annotated tag vX.X.X for CE and another patch release for EE 22 +1. In a separate commit in the stable branch update the VERSION
  23 +1. Create an annotated tag vX.X.X for CE and another patch release for EE `git tag -a vx.x.x -m 'Version x.x.x'`
24 1. Make sure that the build has passed and all tests are passing 24 1. Make sure that the build has passed and all tests are passing
25 1. Push the code and the tags to all the CE and EE repositories 25 1. Push the code and the tags to all the CE and EE repositories
26 1. Apply the patch to GitLab Cloud and the private GitLab development server 26 1. Apply the patch to GitLab Cloud and the private GitLab development server
27 -1. Build new packages with the latest version 27 +1. [Build new packages with the latest version](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
28 1. Cherry-pick the changelog update back into master 28 1. Cherry-pick the changelog update back into master
29 1. Send tweets about the release from `@gitlabhq`, tweet should include the most important feature that the release is addressing as well as the link to the changelog 29 1. Send tweets about the release from `@gitlabhq`, tweet should include the most important feature that the release is addressing as well as the link to the changelog
30 -1. Note in the 'GitLab X.X regressions' issue that the patch was published 30 +1. Note in the 'GitLab X.X regressions' issue that the patch was published(CE only)