Commit 9b75d99d authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'release-doc-improvements' into 'master'

Release doc improvements

Fixes #1527

@jacobvosmaer According to the docs the RC should be deployed on .com before being announced via twitter, so I think this is already covered in the docs.

/cc @all

See merge request !1041
parents 048adf7b 45d887ad
...@@ -153,6 +153,7 @@ git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1' ...@@ -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. Merge the RC1 EE code into GitLab.com.
Once the build is green, create a package. 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. 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. It is important to do this as soon as possible, so we can catch any errors before we release the full version.
...@@ -210,9 +211,16 @@ For GitLab EE, append `-ee` to the branches and tags. ...@@ -210,9 +211,16 @@ For GitLab EE, append `-ee` to the branches and tags.
`v.x.x.0-ee` `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 git checkout master
...@@ -221,16 +229,6 @@ git checkout -b x-x-stable ...@@ -221,16 +229,6 @@ git checkout -b x-x-stable
git push <remote> x-x-stable git push <remote> x-x-stable
``` ```
### **2. 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.
### **3. Create annotated tag vx.x.x** ### **3. 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, In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment