Skip to content

Commit 216fdba

Browse files
Further release tweaks (#597)
1 parent 96d749b commit 216fdba

4 files changed

Lines changed: 9 additions & 1 deletion

File tree

source/Reviewers/curaterelease.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ and the other will review it (**developer** and **reviewer** below).
138138

139139
* Disable the ``Require Linear History`` setting
140140
* Set the only allowed merge method as ``merge`` (remove ``squash``)
141+
* Disable the ``Require branches to be up to date before merging`` setting
142+
(if commits have been pushed to ``main`` since the release, this would
143+
require ``stable`` to be updated with those, which isn't desired).
141144

142145
* The **developer** will make the hotfix change, making sure the branch has been
143146
created from ``stable``. Open a PR for this change targetting ``stable`` and

source/Reviewers/releases/milestones.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
Milestones and Projects
1010
=======================
1111

12+
1213
#. Tidy up all pull requests and issues for the completed milestone in the
1314
Simulation Systems Review and Issues Trackers.
1415

source/Reviewers/releases/other_repos.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Other Repositories
3737
* moci
3838
* um_aux
3939
* socrates-spectral
40+
* gcom
41+
* rose_picker
4042
* mule (if not already done as part of a release)
4143
* shumlib (if not already done as part of a release)
4244

source/Reviewers/releases/umdp_release.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ UMDP Release
3737
URL.
3838

3939
* It is also worth checking no URLs are out of date.
40-
* With a reviewer, follow the :ref:`release process <github-releases>`.
40+
* Open a PR for this branch, targetting ``main`` and get this reviewed and
41+
committed.
42+
* Once on, follow the :ref:`release process <github-releases>` with a reviewer.
4143
* Ensure the action to publish the documentation has successfully completed and
4244
the `new documentation is available <https://metoffice.github.io/um_doc/>`_.

0 commit comments

Comments
 (0)