@@ -241,31 +241,6 @@ Release Milestones
241241Releases
242242*********
243243
244- The following syntax should be used for releases and tags in Git:
245-
246- - Release [Major].[Minor].[Patch Level]
247- - Release Candidate [Major].[Minor].[Patch Level]-rc[RC Number]
248- - Tagging:
249-
250- - v[Major].[Minor].[Patch Level]-rc[RC Number]
251- - v[Major].[Minor].[Patch Level]
252- - v[Major].[Minor].99 - A tag applied to main branch to signify that work on
253- v[Major].[Minor+1] has started. For example, v1.7.99 will be tagged at the
254- start of v1.8 process. The tag corresponds to
255- VERSION_MAJOR/VERSION_MINOR/PATCHLEVEL macros as defined for a
256- work-in-progress main branch version. Presence of this tag allows generation of
257- sensible output for "git describe" on main branch, as typically used for
258- automated builds and CI tools.
259-
260-
261- .. figure :: release_flow.png
262- :align: center
263- :alt: Releases
264- :figclass: align-center
265- :width: 80%
266-
267- Zephyr Code and Releases
268-
269244.. _release_process_lts :
270245
271246Long Term Support (LTS)
@@ -479,6 +454,32 @@ created.
479454Tagging
480455=======
481456
457+
458+ The following syntax should be used for releases and tags in Git:
459+
460+ - Release [Major].[Minor].[Patch Level]
461+ - Release Candidate [Major].[Minor].[Patch Level]-rc[RC Number]
462+ - Tagging:
463+
464+ - v[Major].[Minor].[Patch Level]-rc[RC Number]
465+ - v[Major].[Minor].[Patch Level]
466+ - v[Major].[Minor].99 - A tag applied to main branch to signify that work on
467+ v[Major].[Minor+1] has started. For example, v1.7.99 will be tagged at the
468+ start of v1.8 process. The tag corresponds to
469+ VERSION_MAJOR/VERSION_MINOR/PATCHLEVEL macros as defined for a
470+ work-in-progress main branch version. Presence of this tag allows generation of
471+ sensible output for "git describe" on main branch, as typically used for
472+ automated builds and CI tools.
473+
474+
475+ .. figure :: release_flow.png
476+ :align: center
477+ :alt: Releases
478+ :figclass: align-center
479+ :width: 80%
480+
481+ Zephyr Code and Releases
482+
482483The final release and each release candidate shall be tagged using the following
483484steps:
484485
0 commit comments