Skip to content
Snippets Groups Projects
Verified Commit 626dd006 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

MAINT: update version in docs

parent 8882c300
No related branches found
No related tags found
1 merge request!11DRAFT: file system cleanup
Pipeline #42855 failed
......@@ -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.
......@@ -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 ---------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment