Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
075e5eec
Commit
075e5eec
authored
Aug 26, 2014
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the version before creating the stable branch.
parent
b5cc8136
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
doc/release/monthly.md
doc/release/monthly.md
+10
-13
No files found.
doc/release/monthly.md
View file @
075e5eec
...
@@ -210,9 +210,16 @@ For GitLab EE, append `-ee` to the branches and tags.
...
@@ -210,9 +210,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,21 +228,11 @@ git checkout -b x-x-stable
...
@@ -221,21 +228,11 @@ git checkout -b x-x-stable
git push <remote> x-x-stable
git push <remote> 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
)
.
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.
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**
### **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,
In
`x-x-stable`
branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment