Prepare Heptapod 1.4 hypothetical branching
The upstream merge process having reached the GitLab 16.10 branching point, we need to prepare a branching point for a possible future Heptapod release, but chances are that we will skip it, hence we will not perform all the standard tasks of the new cycle procedure (hopefully this will be the last time we skip an upstream minor version).
Information
- New release version (
1.4
): - Upstream GitLab minor version (
16.10
): - New development version (
1.5
):
Preliminary for new development cycle
-
Perform the oldstable branches shift -
Make sure that HGitaly protocol files in default
branch are up to date with Gitalyg.h
and that heptapod/ci-images/heptapod-gitaly> uses Gitalyg.h
in itsdefault
branch.
Branching point
-
Omnibus: make sure that the first commit of the upstream release branch for g.h
is merged in theheptapod
branch and builds:hg merge "tag('g.h.0+rc42.ce.0')~1"
(we do not use the true branching point (
~2
) because all the GitLab component versions are set to development branches, hence not relevant in catchup times. To be revisited when we have at most a few days of lag). -
Rails, branch heptapod
: tag the chosen branching point asheptapod-x.y.0a0
. Push. -
wait for Omnibus and Heptapod Tests pipelines to confirm.
Release branch
Skipped.
Opening the new development cycle
-
Stable branches shift: skipped
-
Heptapod Tests, branch default: change the base image to n-w-testing
-
Omnibus, branch
heptapod
:-
change HEPTAPOD_VERSION
ton.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 skipped in tag push above.
-
-
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
Skipped (tag on the release branch)