Commit 47b5b3d5 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Tar before omnibus build, we all have master access on dev, don't forget to update installation.md

parent 6a0ea920
...@@ -221,12 +221,7 @@ git checkout -b x-x-stable ...@@ -221,12 +221,7 @@ git checkout -b x-x-stable
git push <remote> x-x-stable git push <remote> x-x-stable
``` ```
### **2. Build the Omnibus packages** ### **2. Set VERSION to x.x.x and push**
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 CE repository if the version changed.
...@@ -236,7 +231,7 @@ Change the VERSION file in `master` branch of the CE repository and commit. Cher ...@@ -236,7 +231,7 @@ Change the VERSION file in `master` branch of the CE repository and commit. Cher
Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE. 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** ### **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,
...@@ -246,12 +241,17 @@ git tag -a vx.x.0 -m 'Version x.x.0' xxxxx ...@@ -246,12 +241,17 @@ git tag -a vx.x.0 -m 'Version x.x.0' xxxxx
where `xxxxx` is SHA-1. where `xxxxx` is SHA-1.
### **5. Push the tag** ### **4. Push the tag**
``` ```
git push origin vx.x.0 git push origin vx.x.0
``` ```
### **5. 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.
### **6. Push to remotes** ### **6. Push to remotes**
For GitLab CE, push to dev, GitLab.com and GitHub. For GitLab CE, push to dev, GitLab.com and GitHub.
...@@ -260,8 +260,6 @@ For GitLab EE, push to the subscribers repo. ...@@ -260,8 +260,6 @@ For GitLab EE, push to the subscribers repo.
Make sure the branch is marked 'protected' on each of the remotes you pushed to. Make sure the branch is marked 'protected' on each of the remotes you pushed to.
NOTE: You might not have the rights to push to master on dev. Ask Dmitriy.
### **7. Publish blog for new release** ### **7. Publish blog for new release**
Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository. Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository.
...@@ -282,6 +280,10 @@ Include a link to the blog post and keep it short. ...@@ -282,6 +280,10 @@ Include a link to the blog post and keep it short.
Proposed email text: Proposed email text:
"We have released a new version of GitLab. See our blog post(<link>) for more information." "We have released a new version of GitLab. See our blog post(<link>) for more information."
### **10. Update installation.md**
Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version.
# **23rd - Optional Patch Release** # **23rd - Optional Patch Release**
# **24th - Update GitLab.com** # **24th - Update GitLab.com**
......
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