Skip to content

Commit 4532617

Browse files
authored
Change release branch creation process to bump version to N.1.0. (#75743)
This will help distinguish release branch builds from development branch builds, and is similar to GCC's version numbering policy. Thus, the branch `releases/18.x` will start out numbered 18.1.0, instead of 18.0.0. Unchanged are other versioning policies: - mainline will be numbered 18.0.0, 19.0.0, ... - typical release branch releases will increment micro version, e.g. 18.1.1, 18.1.2, .... - If an ABI break is required on the release branch, the minor version will be incremented, e.g. to 18.2.0. See the Discourse RFC: https://discourse.llvm.org/t/rfc-name-the-first-release-from-a-branch-n-1-0-instead-of-n-0-0/75384
1 parent 0e039fc commit 4532617

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

llvm/docs/HowToReleaseLLVM.rst

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ Release Approx. Date
4040
=============================== =========================
4141
*release branch: even releases* *4th Tue in January*
4242
*release branch: odd releases* *4th Tue in July*
43-
X.0.0-rc1 3 days after branch.
44-
X.0.0-rc2 2 weeks after branch.
45-
X.0.0-rc3 4 weeks after branch
46-
**X.0.0-final** **6 weeks after branch**
47-
**X.0.1** **8 weeks after branch**
48-
**X.0.2** **10 weeks after branch**
49-
**X.0.3** **12 weeks after branch**
50-
**X.0.4** **14 weeks after branch**
51-
**X.0.5** **16 weeks after branch**
52-
**X.0.6 (if necessary)** **18 weeks after branch**
43+
X.1.0-rc1 3 days after branch.
44+
X.1.0-rc2 2 weeks after branch.
45+
X.1.0-rc3 4 weeks after branch
46+
**X.1.0-final** **6 weeks after branch**
47+
**X.1.1** **8 weeks after branch**
48+
**X.1.2** **10 weeks after branch**
49+
**X.1.3** **12 weeks after branch**
50+
**X.1.4** **14 weeks after branch**
51+
**X.1.5** **16 weeks after branch**
52+
**X.1.6 (if necessary)** **18 weeks after branch**
5353
=============================== =========================
5454

5555
Release Process Summary
@@ -77,7 +77,7 @@ Release Process Summary
7777

7878
* Announce bug fix release schedule to the LLVM community and update the website.
7979

80-
* Do bug-fix releases every two weeks until X.0.5 or X.0.6 (if necessary).
80+
* Do bug-fix releases every two weeks until X.1.5 or X.1.6 (if necessary).
8181

8282
Release Process
8383
===============
@@ -123,6 +123,9 @@ Branch the Git trunk using the following procedure:
123123
version bump. The branch's name is release/X.x where ``X`` is the major version
124124
number and ``x`` is just the letter ``x``.
125125

126+
#. On the newly-created release branch, immediately bump the version
127+
to X.1.0git (where ``X`` is the major version of the branch.)
128+
126129
#. All tags and branches need to be created in both the llvm/llvm-project and
127130
llvm/llvm-test-suite repos.
128131

@@ -406,13 +409,13 @@ Announce the Release
406409
^^^^^^^^^^^^^^^^^^^^
407410

408411
Create a new post in the `Announce Category <https://discourse.llvm.org/c/announce>`_
409-
once all the release tasks are complete. For X.0.0 releases, make sure to include a
410-
link to the release notes in the post. For X.0.1+ releases, generate a changelog
412+
once all the release tasks are complete. For X.1.0 releases, make sure to include a
413+
link to the release notes in the post. For X.1.1+ releases, generate a changelog
411414
using this command and add it to the post.
412415

413416
::
414417

415-
$ git log --format="- %aN: [%s (%h)](https://github.com/llvm/llvm-project/commit/%H)" llvmorg-X.0.N-1..llvmorg-X.0.N
418+
$ git log --format="- %aN: [%s (%h)](https://github.com/llvm/llvm-project/commit/%H)" llvmorg-X.1.N-1..llvmorg-X.1.N
416419

417420
Once the release has been announced add a link to the announcement on the llvm
418421
homepage (from the llvm-www repo) in the "Release Emails" section.

0 commit comments

Comments
 (0)