Download as
Browse Code »

Commit 2242c074afc637c3ef2f7f9367fa60aab7c7f50b

Authored by Job van der Voort
1 parent edc32047
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

improve headers, add details

Showing 1 changed file with 44 additions and 23 deletions   Show diff stats
doc/release/monthly.md
  Diff comments   View file @2242c07
... ... @@ -14,30 +14,30 @@ After making the release branch new commits are cherry-picked from master. When
14 14 * 23nd: Optional patch releases
15 15 * 24-end of month: Release GitLab EE and GitLab CI
16 16  
17   -# 15th - Code Freeze & Release Manager
  17 +# **15th - Code Freeze & Release Manager**
18 18  
19   -- Stop merging in code, except for important bugfixes
  19 +### **1. Stop merging in code, except for important bugfixes**
20 20  
21   -## Release Manager
  21 +### **2. Release Manager**
22 22  
23 23 A release manager is selected that coordinates the entire release of this version. The release manager has to make sure all the steps below are done and delegated where necessary. This person should also make sure this document is kept up to date and issues are created and updated.
24 24  
25   -# 18th - Releasing RC1
  25 +# **18th - Releasing RC1**
26 26  
27 27 > Yo dawg, I heard you like releases..
28 28  
29 29 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.
30 30  
31   -### 1. Create an issue for RC1 release
  31 +### **1. Create an issue for RC1 release**
32 32  
33   -### 2. Update the installation guide
  33 +### **2. Update the installation guide**
34 34  
35 35 1. Check if it references the correct branch `x-x-stable` (doesn't exist yet, but that is okay)
36 36 2. Check the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782)
37 37 3. Check the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794)
38 38 4. There might be other changes. Ask around.
39 39  
40   -### 3. Create an update guide
  40 +### **3. Create an update guide**
41 41  
42 42 It's best to copy paste the previous guide and make changes where necessary. The typical steps are listed below with any points you should specifically look at.
43 43  
... ... @@ -82,7 +82,7 @@ Check if the init.d/gitlab script changed since last release: https://gitlab.com
82 82  
83 83 #### 10. Check application status
84 84  
85   -### 4. Code quality indicatiors
  85 +### **4. Code quality indicatiors**
86 86 Make sure the code quality indicators are green / good.
87 87  
88 88 * [![build status](http://ci.gitlab.org/projects/1/status.png?ref=master)](http://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
... ... @@ -95,50 +95,71 @@ Make sure the code quality indicators are green / good.
95 95  
96 96 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
97 97  
98   -### 5. Set VERSION
  98 +### **5. Set VERSION**
99 99  
100 100 Set VERSION tot x.x.0.rc1
101 101  
102 102  
103   -### 6. Tag
  103 +### **6. Tag**
104 104  
105 105 Create an annotated tag that points to the version change commit.
106 106 ```
107 107 git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1'
108 108 ```
109 109  
110   -### 7. Tweet
  110 +### **7. Tweet**
111 111  
112 112 Tweet about the RC release. Make sure to explain what a RC is.
113 113  
114   -### 8. Update Cloud
  114 +### **8. Update Cloud**
115 115  
116 116 Merge the RC1 code into Cloud. Once the build is green, deploy in the morning.
117 117  
118 118 It is important to do this as soon as possible, so we can catch any errors before we release the full version.
119 119  
120 120  
121   -# 22nd - Release
  121 +# **22nd - Release**
122 122  
123 123 After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
124 124  
125 125  
126   -- Create x-x-stable branch and push to the repositories
127   -- QA
128   -- Fix anything coming out of the QA
129   -- Set VERSION to x.x.0
130   -- Create annotated tag x.x.0
131   -- Push VERSION + Tag to master, merge into x-x-stable
132   -- Publish blog for new release
133   -- Tweet to blog (see below)
  126 +### **1. Create x-x-stable branch and push to the repositories**
134 127  
135   -# Write a blog post
  128 +```
  129 +git checkout master
  130 +git pull
  131 +git checkout -b x-x-stable
  132 +git push <remote> x-x-stable
  133 +```
  134 +
  135 +### **2. Build the Omnibus packages**
  136 +[Follow this guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
  137 +
  138 +### **3. QA**
  139 +Use the omnibus packages to test the following:
  140 +
  141 +### **4. Fix anything coming out of the QA**
  142 +
  143 +### **5. Set VERSION to x.x.0**
  144 +
  145 +### **6. Create annotated tag vx.x.0**
  146 +```
  147 +git tag -a vx.x.0 -m 'Version x.x.0'
  148 +```
  149 +
  150 +### **7. Push VERSION + Tag to master, merge into x-x-stable**
  151 +```
  152 +git push origin master
  153 +```
  154 +
  155 +Next, merge the VERSION into the x-x-stable branch.
136 156  
  157 +### **8. Publish blog for new release**
137 158 * Mention what GitLab is on the second line: GitLab is open source software to collaborate on code.
138 159 * Select and thank the the Most Valuable Person (MVP) of this release.
139 160 * Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
140 161  
141   -# Tweet
  162 +### **9. Tweet to blog**
142 163  
143 164 Send out a tweet to share the good news with the world. For a major/minor release, list the features in short and link to the blog post.
144 165  
... ...