瀏覽代碼

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.
Brad King 1 年之前
父節點
當前提交
b866eb8458
共有 1 個文件被更改,包括 13 次插入2 次删除
  1. 13 2
      Help/dev/maint.rst

+ 13 - 2
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
 -------------------------