diff options
| author | Brad King <brad.king@kitware.com> | 2024-10-09 15:52:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-10-09 15:59:51 (GMT) |
| commit | b866eb8458f22e3fe60640b1140b3c7a2e5704b6 (patch) | |
| tree | eafa0aa848378114570abdb8dea1ac79a8fc27c5 /Help | |
| parent | b062c18c6463963bd643afae74866ab8462335e1 (diff) | |
| download | CMake-b866eb8458f22e3fe60640b1140b3c7a2e5704b6.zip CMake-b866eb8458f22e3fe60640b1140b3c7a2e5704b6.tar.gz CMake-b866eb8458f22e3fe60640b1140b3c7a2e5704b6.tar.bz2 | |
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.
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/dev/maint.rst | 15 |
1 files 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 ------------------------- |