diff --git a/CHANGELOG.md b/CHANGELOG.md index c9357d83cd25b22dbc5773fa2bc880344f5f4d85..eb572ac428a00b4965b5308e51c52a158e66ea16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] ## + +### Added ### + +### Changed ### + +### Deprecated ### + +### Removed ### + +### Fixed ### + +### Security ### + +### Documentation ### + ## [0.3] - 2023-01-19 (Florian Spreckelsen) diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index a3d196e1ce803e777a009780f5379c373b866b7c..2200e9b574dca12106f060ab9f4876c49d2ec03c 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -28,8 +28,12 @@ guidelines of the CaosDB Project 7. Delete the release branch. -8. Prepare the next release cycle by updating - [CMakeLists.txt](./CMakeLists.txt) - bump the version number of - `CAOSDB_PROTO_VERSION` to the next minor number. +8. Merge the `main` branch back into `dev` -9. Create release on gitlab.indiscale.com and gitlab.com +9. Prepare the next release cycle by updating [CMakeLists.txt](./CMakeLists.txt) + in the `dev` branch - bump the version number of `CAOSDB_PROTO_VERSION` to + the next minor number. + +10. Add a new `Unreleased` section to the changelog + +11. Create releases on gitlab.indiscale.com and gitlab.com