From b866eb8458f22e3fe60640b1140b3c7a2e5704b6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 9 Oct 2024 11:52:57 -0400 Subject: Help/dev: Add maintainer guide release branch creation to use a MR for CI Provide a way to run CI with a new release version number before merging it. --- Help/dev/maint.rst | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index c904673..10b3f7d 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -306,11 +306,22 @@ Commit with a message such as:: Begin post-$ver development -Push the update to the ``master`` and ``release`` branches: +Create a topic branch for the update to ``master``: .. code-block:: shell - git push --atomic origin master release-$ver:release + git branch branch-$ver master + +Open a merge request with the ``branch-$ver`` branch for review and CI. +Add the following trailing lines in the merge request description:: + + Fast-forward: true + Backport-ff: release:HEAD~1^2 + +This configures the ``Do: merge`` action to fast-foward the ``master`` +and ``release`` branches to the respective commits created above. + +Further steps may proceed after this has been merged. Announce 'release' Branch ------------------------- -- cgit v0.12