Commit 223070b3fe9cb302d3d47ba5a616d90bab8910fd
1 parent
814a4595
Exists in
spb-stable
and in
3 other branches
add steps to monthly releases
Showing
1 changed file
with
21 additions
and
5 deletions
Show diff stats
doc/release/monthly.md
| @@ -58,16 +58,32 @@ Check if changed since last release (~22nd of last month depending on when last | @@ -58,16 +58,32 @@ Check if changed since last release (~22nd of last month depending on when last | ||
| 58 | 58 | ||
| 59 | * [](https://coveralls.io/r/gitlabhq/gitlabhq) | 59 | * [](https://coveralls.io/r/gitlabhq/gitlabhq) |
| 60 | 60 | ||
| 61 | -## Make a release branch | 61 | +## Release Schedule |
| 62 | 62 | ||
| 63 | 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: | 63 | 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: |
| 64 | 64 | ||
| 65 | -* 1-7th: official merge window (see contributing guide) | ||
| 66 | -* 8-14th: work on bugfixes, sponsored features and GitLab EE | ||
| 67 | -* 15th: code freeze (stop merging into master except essential bugfixes) | ||
| 68 | -* 18th: release candidate 1 (VERSION x.x.0.rc1, annotated tag and tweet about x.x.0.rc1, release on GitLab Cloud) | 65 | +* 1-7th: Official merge window (see contributing guide). |
| 66 | +* 8-14th: Work on bugfixes, sponsored features and GitLab EE. | ||
| 67 | +* 15th: Code freeze | ||
| 68 | + - Stop merging into master, except essential bugfixes | ||
| 69 | + - Announce a Release Manager | ||
| 70 | +* 18th: Release Candidate 1 (VERSION x.x.0.rc1, annotated tag and tweet about x.x.0.rc1, release on GitLab Cloud) | ||
| 71 | + - Set VERSION to x.x.0.rc1 | ||
| 72 | + - Create annotated tag x.x.0.rc1 | ||
| 73 | + - Push the changes to GitLab.com, dev.gitlab.com, GitHub | ||
| 74 | + - Tweet about the release | ||
| 75 | + - Create a new branch on cloud for rc1 | ||
| 76 | + - Deploy the new branch on Cloud after tests pass | ||
| 69 | * 20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) | 77 | * 20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) |
| 70 | * 22nd: release (VERSION x.x.0, create x-x-stable branch, annotated tag tag, blog and tweet) | 78 | * 22nd: release (VERSION x.x.0, create x-x-stable branch, annotated tag tag, blog and tweet) |
| 79 | + - Create x-x-stable branch and push to the repositories | ||
| 80 | + - QA | ||
| 81 | + - Fix anything coming out of the QA | ||
| 82 | + - Set VERSION to x.x.0 | ||
| 83 | + - Create annotated tag x.x.0 | ||
| 84 | + - Push VERSION + Tag to master, merge into x-x-stable | ||
| 85 | + - Publish blog for new release | ||
| 86 | + - Tweet to blog (see below) | ||
| 71 | * 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) | 87 | * 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) |
| 72 | * 24-end of month: release GitLab EE and GitLab CI | 88 | * 24-end of month: release GitLab EE and GitLab CI |
| 73 | 89 |