Creation of 0.41 release branch and new development cycle
Information
- New release version (
x.y
): 0.41 - Upstream GitLab minor version (
g.h
): 16.3 - New development version (
n.w
): 0.42 . It should not ever be released, because the next one should at least be GitLab 16.5 and we need to keep room for possible at posteriori intermediate releases. The actual next released version should be 1.0.
Preliminary for new development cycle
-
Perform the oldstable branches shift -> #1279 (closed)
Branching point
-
Omnibus: make sure that the branching point for upstream g.h
is merged in theheptapod
branch and builds. Usually this is given by revsettag('g.h.0+rc42.ce.0')~~2
. -
Rails, branch heptapod
: tag the chosen branching point asheptapod-x.y.0a0
. Push. -
wait for Omnibus and Heptapod Tests pipelines to confirm (had to perform a fix in Omnibus so this will be `heptapod-x.y.0a0-2)
Release branch
-
Rails: create the heptapod-x-y
branch, starting from the changeset introducing thea0
tag, by copying over and completingHEPTAPOD_CHANGELOG
from the previous release branch and settingHEPTAPOD_VERSION
. -
Omnibus: create the heptapod-x-y
branch, starting from the changeset introducing thea0
tag. -
Heptapod Tests: start the heptapod-x-y
branch
Opening the new development cycle
-
Perform the stable branches shift. At this point heptapod-stable
is the developement branch matching theheptapod-x-y
branch -
Heptapod Tests, branch default: change the base image to n-w-testing
-
Omnibus, branch
heptapod
:-
change HEPTAPOD_VERSION
toheptapod-n.w.0.pre
-
CI/CD: change cache key in heptapod-ci.yml
-
Tag as heptapod-n.w.0.pre-1
. Caution: do not forget the-1
suffix. -
Pipeline succeeds. This is in particular a useful cache warm-up.
-
-
Rails, branch `heptapod:
-
change HEPTAPOD_VERSION
toheptapod.n.w.0.pre
-
CI/CD change cache key in heptapod-ci-yml
-
Commit, push, open regular MR. -
Pipeline succeeds. This ensures that subsequent MRs will not be polluted by problems introduced in this opening. -
Rebase existing topics on the current heptapod
branch, notably theupstream-merge
topic if present. -
Resume upstream conversion (e.g., solve existing Upstream merge issues).
-
Wrapping it up
-
Rails, release branch: create a tag heptapod-x.y.0a1
. This validates that release builds will work for thex.y
series
Edited by Georges Racinet