From 4147fc7eb62eb58fe33a9eea7b5450ae011b6e96 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 4 Jun 2014 09:27:23 +0200 Subject: [PATCH] Update patch release document. --- doc/release/patch.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/release/patch.md b/doc/release/patch.md index 4f7f9673702..7762c9f0e11 100644 --- a/doc/release/patch.md +++ b/doc/release/patch.md @@ -17,14 +17,14 @@ Otherwise include it in the monthly release and note there was a regression fix 1. Fix the issue on a feature branch, do this on the private GitLab development server 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. In a separate commit in the stable branch update the VERSION 1. In a separate commit in the stable 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. Create an annotated tag vX.X.X for CE and another patch release for EE +1. In a separate commit in the stable branch update the VERSION +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'` 1. Make sure that the build has passed and all tests are passing 1. Push the code and the tags to all the CE and EE repositories 1. Apply the patch to GitLab Cloud and the private GitLab development server -1. Build new packages with the latest version +1. [Build new packages with the latest version](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md) 1. Cherry-pick the changelog update back into master 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 -1. Note in the 'GitLab X.X regressions' issue that the patch was published +1. Note in the 'GitLab X.X regressions' issue that the patch was published(CE only)