diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-11-29 13:56:19 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-29 13:56:19 +0300 |
| commit | b260439e8b259572630c1ad199926e442882f07d (patch) | |
| tree | 450444cab4cd27a7999860d87fa2b450828bb4cb | |
| parent | 12d851e23867294a1f17a22e2b054fb484b8a37f (diff) | |
Simplify versioning process
| -rw-r--r-- | doc/PROCESS.md | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/doc/PROCESS.md b/doc/PROCESS.md index b750a79c1..ebf866c3c 100644 --- a/doc/PROCESS.md +++ b/doc/PROCESS.md @@ -10,21 +10,12 @@ Gitaly uses [SemVer](https://semver.org) version numbering. ## Branching Model -All tags get created on the `master` branch, except patch releases for -older minor versions. Such patches get an "on-demand stable branch". - -### Example: - -Suppose we have the following sequence of tags on Gitaly `master`: - -- v6.0.0 -- v5.4.4 -- v5.4.3 - -Now imagine GitLab `12-3-stable` uses Gitaly 5.4.3 and we have a Gitaly -bug fix we want to include in GitLab `12-3-stable`. We will create an -"on-demand stable branch" in Gitaly for this: - -1. Create `5-4-stable` in Gitaly from the latest 5.4.x tag: - `git checkout -b 5-4-stable v5.4.4`. -2. Create Gitaly `v5.4.5` on the `5-4-stable` branch. +All `vX.Y.0` tags get created on the `master` branch. We only make patch +releases when targeting a GitLab stable branch. Patch releases +(`vX.Y.1`, `vX.Y.2`, ...) must be made on stable branches (`X-Y-stable`) +in the Gitaly repository. + +There should be **no patch releases on `master`**. Gitaly patch releases should +only be used for GitLab stable branches. If the release is not for a +GitLab stable branch, just increment the minor (or major) version +counter. |