From 075e5eeccb91b742c7209dd3668ec9d28e4d0ea1 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Tue, 26 Aug 2014 10:04:57 +0200 Subject: Change the version before creating the stable branch. --- doc/release/monthly.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 09bdde81dcc..7f8f3255e9b 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -210,9 +210,16 @@ For GitLab EE, append `-ee` to the branches and tags. `v.x.x.0-ee` -Merge CE into EE if needed. +Note: Merge CE into EE if needed. -### **1. Create x-x-stable branch and push to the repositories** +### **1. Set VERSION to x.x.x and push** + +- Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. +- Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed. +- Change the VERSION file in `master` branch of the CE repository and commit and push. +- Change the VERSION file in `master` branch of the EE repository and commit and push. + +### **2. Create x-x-stable branch and push to the repositories** ``` git checkout master @@ -221,21 +228,11 @@ git checkout -b x-x-stable git push x-x-stable ``` -### **2. Build the Omnibus packages** +### **3. Build the Omnibus packages** Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md). This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase. -### **3. Set VERSION to x.x.x and push** - -Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed. - -Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed. - -Change the VERSION file in `master` branch of the CE repository and commit. Cherry-pick into the `x-x-stable` branch of CE. - -Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE. - ### **4. Create annotated tag vx.x.x** In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit, -- cgit v1.2.1 From 099e17038fb71739ec2c7d785cfccb069305b439 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Tue, 26 Aug 2014 10:20:55 +0200 Subject: Add note about testing the migrations. --- doc/release/monthly.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 7f8f3255e9b..260b049fd74 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -153,6 +153,7 @@ git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1' Merge the RC1 EE code into GitLab.com. Once the build is green, create a package. +If there are big database migrations consider testing them with the production db on a VM. Try to deploy in the morning. It is important to do this as soon as possible, so we can catch any errors before we release the full version. -- cgit v1.2.1