Skip to content

Commit

Permalink
Merge pull request #71 from lsst-ts/tickets/DM-46736
Browse files Browse the repository at this point in the history
Update versioning description for ts_config_* project tags.
  • Loading branch information
wvreeven authored Oct 9, 2024
2 parents 4bda991 + ff2e889 commit e3b74e1
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion doc/development-guidelines/versioning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Exceptions (e.g. see the cycle build) should be well documented in the package a

Tagging a version has the following rules:

* ticket branches can be tagged with ``vX.Y.Z-alpha.N`` or ``vX.Y.Z-beta.N`` tags
* Ticket branches can be tagged with ``vX.Y.Z-alpha.N`` or ``vX.Y.Z-beta.N``
* The develop branch can be tagged with ``vX.Y.Z-rc.N``
If your code is using ts_xml develop branch then the CSC release must be tagged here.
* Main branch is reserved for main tags: ``vX.Y.Z``
Expand All @@ -20,6 +20,13 @@ Where X, Y and Z are major, minor and point/hotfix respectively.

* The Annotation is a meaningful text description of the release

* For the ts_config_* projects, no ``-`` should be used but instead a ``.``.

* Ticket branches can be tagged with ``vX.Y.Z.alpha.N`` or ``vX.Y.Z.beta.N``
In the `cycle.env` file of `ts_cycle_build <https://ts-cycle-build.lsst.io/>`_ the tag needs to be referred to as ``X.Y.ZaN`` or ``X.Y.ZbN``.
* The develop branch can be tagged with ``vX.Y.Z.rc.N``
In the `cycle.env` file of `ts_cycle_build <https://ts-cycle-build.lsst.io/>`_ the tag needs to be referred to as ``X.Y.ZrcN`` or ``X.Y.ZrcN``.

.. tab-set::

.. tab-item:: Tag alpha
Expand Down

0 comments on commit e3b74e1

Please sign in to comment.