diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 584227a7cb02be7bda1cd29fe5d031332177fb9f..f7d8225823d85b21d9c7d70fb52239b20b4d1798 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -22,12 +22,14 @@ guidelines of the CaosDB Project 3. Assure that the latest patch actually updates the CaosDBVersion() procedure and that the version matches the version you are about to release. -4. Merge the release branch into the main branch. +4. Update version in `doc/conf.py`. -5. Wait for the main branch pipeline to pass. +5. Merge the release branch into the main branch. -6. Tag the latest commit of the main branch with `v<VERSION>`. +6. Wait for the main branch pipeline to pass. -7. Delete the release branch. +7. Tag the latest commit of the main branch with `v<VERSION>`. -8. Merge the main branch back into the dev branch. +8. Delete the release branch. + +9. Merge the main branch back into the dev branch. diff --git a/doc/conf.py b/doc/conf.py index b4e7e4b15793ada52a8f6ada43270a68444b35b7..173694cad0e3ec295dc119d8c526827710ff1286 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -26,9 +26,9 @@ copyright = '2021, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version -version = '6.0' +version = '7.0' # The full version, including alpha/beta/rc tags -release = '6.0.1' +release = '7.0.0' # -- General configuration ---------------------------------------------------