From c2e69404b44c5758cd7f1361ecfcde8d4b1b2d41 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 25 May 2021 10:22:31 +0200 Subject: [PATCH] add client/server version alignment Signed-off-by: Andy Scherzinger --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba759e7b1..5ace944d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -364,11 +364,12 @@ Beware that beta releases for an upcoming version will always use the minor and ## Release cycle -* Feature releases are planned every ~2 months, with 6 weeks of developing and 2 weeks of stabilising +* major releases are linked to the corresponding [server-releases](https://apps.nextcloud.com/apps/spreed/releases) with aligned release date and version number (server version = 11 = client version) +* feature releases are planned every ~2 months, with 6 weeks of developing and 2 weeks of stabilising * after feature freeze a public release candidate on play store and f-droid is released * ~2 weeks testing, bug fixing * release final version on f-droid and play store -* Bugfix releases (dot releases, e.g. 3.2.1) are released 4 weeks after stable version from the branch created with first stable release (stable-3.2). +* bugfix releases (dot releases, e.g. 3.2.1) are released 4 weeks after stable version from the branch created with first stable release (stable-3.2). Hotfixes as well as security fixes are released via bugfix releases (dot releases) but are released on demand in contrast to regular, scheduled bugfix releases.