Skip to content

Commit 4233d9b

Browse files
committed
Merge PR ceph#62089 into main
* refs/pull/62089/head: doc/dev/release-checklists: add vX.3.0 checklist item doc/dev/release-checklist: check v20.0.0 tag Reviewed-by: Adam King <[email protected]>
2 parents eeebef2 + 368f9b0 commit 4233d9b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

doc/dev/release-checklists.rst

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ Versions and tags
1818
- [x] Update CMakeLists.txt VERSION (right at the top to X.0.0)
1919
- [x] Update src/librbd/CMakeLists.txt VERSION (librbd target at the bottom to 1.X.0)
2020
- [x] Update src/ceph_release with the new release name, number, and type ('dev')
21-
- [ ] Initial tag vX.0.0 (so that we can distinguish from (and sort
22-
after) the backported (X-1).2.Z versions.
21+
- [x] Initial tag vX.0.0 so that we can distinguish from (and sort after) the backported (X-1).2.Z versions.
2322

24-
### Notes on tagging
25-
* Tags must be annonated as CMake determines `CEPH_GIT_NICE_VER` by
26-
calling `git describe --always`.
27-
* vX.0.0 are special ones in the sense they are pushed manually (unlike v.X.2.n
28-
which are handled by Jenkins).
29-
* vX.0.0 should point to a commit before the first one in a kickoff branch.
23+
.. note::
24+
25+
- Tags must be annotated as CMake determines ``CEPH_GIT_NICE_VER`` by calling ``git describe --always``.
26+
- vX.0.0 are special ones in the sense they are pushed manually (unlike vX.1.Z and vX.2.Z which are handled by Jenkins).
27+
- vX.0.0 should point to a commit before the first one in a kickoff branch.
3028

3129
Define release names and constants
3230
----------------------------------
@@ -129,6 +127,7 @@ After dev freeze
129127
================
130128

131129
- [ ] create branch for new release
130+
- [ ] create vX.3.0 annotated tag on ``main`` so upgrades from new release to main are not wrongly considered downgrades.
132131
- [ ] remove ``doc/releases/*.rst``. This should leave behind ``doc/releases/releases.yml`` which is used for doc building purposes. See also commit 33d63c3 ("doc: remove release notes for release branch") for details.
133132
- [ ] cherry-pick 8cf9ad62949516666ad0f2c0bb7726ef68e4d666 ("doc: add releases links to toc"). There will be trivial conflicts.
134133
- [ ] add redirect for new major release at `RTD <https://readthedocs.org/dashboard/ceph/redirects/>`_.

0 commit comments

Comments
 (0)