Commit cb4b504b26a269ba6ebb3fee165296a80d962c69
Exists in
spb-stable
and in
2 other branches
Merge branch 'merge-patch-changelog-back-into-master' into 'master'
Merge patch changelog back into master /cc @dzaporozhets
Showing
1 changed file
with
7 additions
and
4 deletions
Show diff stats
doc/release/patch.md
| @@ -9,17 +9,20 @@ Otherwise include it in the monthly release and note there was a regression fix | @@ -9,17 +9,20 @@ Otherwise include it in the monthly release and note there was a regression fix | ||
| 9 | ## Release Procedure | 9 | ## Release Procedure |
| 10 | 10 | ||
| 11 | 1. Verify that the issue can be repoduced | 11 | 1. Verify that the issue can be repoduced |
| 12 | +1. Note in the 'GitLab X.X regressions' that you will create a patch | ||
| 12 | 1. Create an issue on private GitLab development server | 13 | 1. Create an issue on private GitLab development server |
| 13 | 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier | 14 | 1. Name the issue "Release X.X.X CE and X.X.X EE", this will make searching easier |
| 14 | 1. Fix the issue on a feature branch, do this on the private GitLab development server | 15 | 1. Fix the issue on a feature branch, do this on the private GitLab development server |
| 15 | 1. Consider creating and testing workarounds | 16 | 1. Consider creating and testing workarounds |
| 16 | 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch | 17 | 1. After the branch is merged into master, cherry pick the commit(s) into the current stable branch |
| 17 | -1. In a separate commit in the stable branch, update the VERSION and CHANGELOG | 18 | +1. In a separate commit in the stable branch update the VERSION |
| 19 | +1. In a separate commit in the stable branch update the CHANGELOG | ||
| 18 | 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" | 20 | 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" |
| 19 | 1. Create an annotated tag vX.X.X for CE and another patch release for EE | 21 | 1. Create an annotated tag vX.X.X for CE and another patch release for EE |
| 20 | -1. Make sure that the build has passed and no tests are failing | 22 | +1. Make sure that the build has passed and all tests are passing |
| 21 | 1. Push the code and the tags to all the CE and EE repositories | 23 | 1. Push the code and the tags to all the CE and EE repositories |
| 22 | 1. Apply the patch to GitLab Cloud and the private GitLab development server | 24 | 1. Apply the patch to GitLab Cloud and the private GitLab development server |
| 23 | -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 | ||
| 24 | 1. Build new packages with the latest version | 25 | 1. Build new packages with the latest version |
| 25 | - | 26 | +1. Cherry-pick the changelog update back into master |
| 27 | +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 | ||
| 28 | +1. Note in the 'GitLab X.X regressions' issue that the patch was published |