1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
# GitLab Pages processes
## Reviewing
A contribution to GitLab Pages should generally be reviewed by at least two
people - one acting as initial reviewer, the other as a maintainer. Trivial
fixes may go straight to a maintainer. People should not merge their own
contributions.
## Versioning
GitLab Pages follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
The `X-Y-stable` branches and `master` should never have their history
rewritten. Tags should never be deleted.
## Releasing
Pages is tightly coupled to GitLab itself. To align with GitLab's
[development month](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md),
new versions of GitLab Pages are released before the 7th of each month (assuming
any changes have been made). To do so:
1. For major and minor releases, create a stable branch if it doesn't already exist:
```shell
git checkout -b X-Y-stable master # MAJOR.MINOR
git push https://gitlab.com/gitlab-org/gitlab-pages.git X-Y-stable
git push https://dev.gitlab.org/gitlab/gitlab-pages.git X-Y-stable
```
1. Review the list of changes since the last release and create a changelog
1. Decide on the version number by reference to the [Versioning](#versioning) section
1. [Create a new issue](https://gitlab.com/gitlab-org/gitlab-pages/issues/new) containing the changelog
1. Create a new merge request, modifying the `CHANGELOG` and `VERSION` files, targeting the correct stable branch
1. Once it's merged, create a signed+annotated tag pointing to the **merge commit** on the **stable branch**, e.g.:
```shell
git fetch origin 1-0-stable
git tag -a -s -m "Release v1.0.0" v1.0.0 origin/1-0-stable
git push https://gitlab.com/gitlab-org/gitlab-pages.git v1.0.0
git push https://dev.gitlab.org/gitlab/gitlab-pages.git v1.0.0
```
1. Create a merge request against [GitLab](https://gitlab.com/gitlab-org/gitlab-ce) to update `GITLAB_PAGES_VERSION`
As each release is made, the `CHANGELOG` for the stable branch will be updated
to contain content not in the **master** branch. To resolve this, the stable
branches may be merged to **master**. For more complicated merges, it may be
easier to pick just the updates to `CHANGELOG`.
## Stable releases
Typically, release tags point to a specific commit on the **master** branch. As
the Pages repository experiences a low rate of change, this allows most releases
to happen in conformance with semver, without the overhead of multiple
[stable branches](https://docs.gitlab.com/ee/workflow/gitlab_flow.html).
A bug fix may required in a particular version after the **master** branch has
moved on. This may happen between the 7th and 22nd of a release month, relating
to the **previous** release, or at any time for a security fix.
GitLab may backport security fixes for up to three releases, which may
correspond to three separate minor versions of GitLab Pages - and so three new
versions to release. See [Security releases](#Security releases) for the details.
In either case, the fix should first be developed against the master branch.
Once ready, the fix should be merged to master, where it will be
included in the next major or minor release as usual.
The fix may be cherry-picked into each relevant stable branch, and a new patch
release made in the same way as defined above.
When updating `GITLAB_PAGES_VERSION` in the [GitLab](https://gitlab.com/gitlab-org/gitlab-ce)
repository, you should target the relevant `X-Y-stable` branches there. In
general, these branches should only ever have the patch version of GitLab pages
incremented.
## Security releases
We follow general [security release workflow](https://about.gitlab.com/handbook/engineering/workflow/#security-issues) for pages releases.
Use [Security Release](.gitlab/merge_request_templates/Security Release.md) template for security related merge requests.
### After security release has been published
Maintainer needs to manually sync tags and branches from dev.gitlab.org to gitlab.com:
- [ ] Sync `master` branch
- [ ] Sync affected `*-*-stable` branches
- [ ] Sync affected `v*.*.*` tags
|
