From 49493d89cf930079a3b590e227c9ce1c10f21ec2 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Apr 2016 01:13:21 +0800 Subject: [PATCH] RELEASING: clarify, tag next commit in master --- RELEASING.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/RELEASING.rst b/RELEASING.rst index a1eb4f969..b41d1cf1c 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -7,11 +7,12 @@ Major releases -------------- 1. Create branch release-X from master. -2. Ensure that release versions of all packages required are available under the ``main`` label in conda. Ensure that new packages in ``main`` do not break older ARTIQ releases. -3. Remove any unfinished features. -4. Test and fix any problems found. -5. If you have willing testers for release candidates, tag X.0rc0, have it build, and point testers there. Iterate over the previous points with new release candidates if necessary. -6. Tag X.0, have it build, and copy its packages to ``main`` channel. +2. Tag the next commit in master X+1.0.dev. +3. Ensure that release versions of all packages required are available under the ``main`` label in conda. Ensure that new packages in ``main`` do not break older ARTIQ releases. +4. In the release-X branch, remove any unfinished features. +5. Test and fix any problems found. Apply fixes to both master and release-X. +6. If you have willing testers for release candidates, tag X.0rc1 in the release-X branch, have it build, and point testers there. Iterate over the previous points with new release candidates if necessary. +7. Tag X.0 in the release-X branch, build it, and copy its packages to ``main`` channel. Minor (bugfix) releases -----------------------