Markers for upstream GitLab v17.4 branching point
Issue automatically created by the upstream merge process ### Information - New release version: 17.4 - New development version: 17.5 ### Preliminary for new development cycle - [x] Make sure that HGitaly protocol files in `default` branch are up to date with Gitaly `17.4` and that heptapod/ci-images/heptapod-gitaly> uses Gitaly `17.4` in its `default` branch. ### Branching point - [x] Omnibus: make sure that the first commit of the upstream release branch for `17.4` is merged in the `heptapod` branch. ``` hg log -r "(tag('17.4.0+rc42.ce.0')~2) % heptapod" ``` Nowadays the Omnibus merges are handled by the semi-automated Upstream Merge process. - [x] Rails: make sure that the `heptapod-stable` and `heptapod-oldstable` branches are fully merged in `heptapod` (make MRs if needed). - [ ] Rails, branch `heptapod`: tag the chosen branching point as `heptapod-17.4.0a0`. Push, skipping pipeline: we do not need a tag on the Omnibus side, and the corresponding build would be on current heads of other GitLab components (notably Gitaly), which is inappropriate and prone to fail is Heptapod is lagging behind. ### Opening the new development cycle - [x] Heptapod Tests, branch default: change the base image to `17-5-testing` - Omnibus, branch `heptapod`: - [x] change `HEPTAPOD_VERSION` to `17.5.0.pre` - [x] CI/CD: change cache key in `heptapod-ci.yml` - [x] Tag as `heptapod-17.5.0.pre-1`. Caution: do not forget the `-1` suffix. - [x] Push skipping CI (there is indeed no tarball for `heptapod-17.5.0.pre`) - Rails, branch `heptapod`: - [x] change `HEPTAPOD_VERSION` to `heptapod.17.5.0.pre` - [x] CI/CD change cache key in `heptapod-ci-yml` - [x] Commit, push, open MR manually, with the ~"Upstream merge" label to trigger the Omnibus build - [x] Remove the ~"Upstream merge" label on the present issue: there is no reason to block the process any more. - [ ] Pipeline succeeds. This ensures that subsequent MRs will not be harmed by problems introduced in the opening itself. - [ ] Rebase existing topics on the current `heptapod` branch, notably the `upstream-merge` topic if present. - [ ] Solve existing ~"Upstream merge" issues if any. [Heptapod Rails]: https://foss.heptapod.net/heptapod/heptapod/-/pipelines [Omnibus Heptapod]: https://foss.heptapod.net/heptapod/omnibus-heptapod/-/pipelines
issue