From e6788d0380bdaf02d43498347616e6f3c4195663 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Fri, 25 Mar 2022 13:35:14 +0100 Subject: [PATCH] MAINT: update RELEASE_GUIDELINES --- RELEASE_GUIDELINES.md | 12 +++++++----- src/doc/conf.py | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 9dd648c2..f0856c6a 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -18,12 +18,14 @@ guidelines of the CaosDB Project 2. Check all general prerequisites. -3. Merge the release branch into the main branch. +3. update src/doc/conf.py version -4. Tag the latest commit of the main branch with `v<VERSION>`. +4. Merge the release branch into the main branch. -5. Delete the release branch. +5. Tag the latest commit of the main branch with `v<VERSION>`. -6. Merge the main branch back into the dev branch. +6. Delete the release branch. -7. Prepare CHANGELOG for next release cycle. +7. Merge the main branch back into the dev branch. + +8. Prepare CHANGELOG for next release cycle. diff --git a/src/doc/conf.py b/src/doc/conf.py index 8e627dd0..34639e51 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -26,9 +26,9 @@ copyright = '2020, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version -version = '0.X.Y' +version = '0.5.0' # The full version, including alpha/beta/rc tags -release = '0.x.y-beta-rc2' +release = '0.5.0' # -- General configuration --------------------------------------------------- -- GitLab