From 332a3c6d48d5ef67e2aa8fe964a632136a282293 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Wed, 16 Jul 2014 11:02:41 +0200 Subject: Make rc1 for GitLab.com complete and fix boldness. --- doc/release/monthly.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 1c95a45c92c..a79a3c01863 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -145,7 +145,9 @@ git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1' ### **1. Update GitLab.com** -Merge the RC1 code into GitLab.com. Once the build is green, deploy in the morning. +Merge the RC1 EE code into GitLab.com. +Once the build is green, create a package. +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. ### **2. Prepare the blog post** @@ -173,7 +175,7 @@ Tweet about the RC release: > GitLab x.x.0.rc1 is out. This release candidate is only suitable for testing. Please create issues for regressions and add a link from LINK_TO_ISSUE. -# **21st - Preparation ** +# **21st - Preparation** ### **1. Q&A** -- cgit v1.2.1 From 9e3694a6e300748fd14eaa19e442297a44b9f742 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Wed, 16 Jul 2014 11:27:18 +0200 Subject: Seperate CE in EE merge. --- doc/release/monthly.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/release/monthly.md b/doc/release/monthly.md index a79a3c01863..97649564094 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -21,6 +21,10 @@ Any changes not yet added to the changelog are added by lead developer and in th * Update the changelog (#LINK) +16th: + +* Merge CE in to EE (#LINK) + 17th: * Create x.x.0.rc1 (#LINK) @@ -48,22 +52,22 @@ Any changes not yet added to the changelog are added by lead developer and in th * Deploy to GitLab.com (#LINK) ``` -# **17th - Create RC1** +# **16th - Merge the CE into EE** -The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub. +Do this via a merge request. -### **1. Merge the CE code into EE** +# **17th - Create RC1** -Do this via a merge request. +The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub. -### **2. Update the installation guide** +### **1. Update the installation guide** 1. Check if it references the correct branch `x-x-stable` (doesn't exist yet, but that is okay) 1. Check the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782) 1. Check the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794) 1. There might be other changes. Ask around. -### **3. Create an update guides** +### **2. Create an update guides** 1. Create: CE update guide from previous version. Like `from-6-8-to-6.9` 1. Create: CE to EE update guide in EE repository for latest version. @@ -115,7 +119,7 @@ Check if the `init.d/gitlab` script changed since last release: