From 742d42fdd2ad1b114e737e96e5e6951b7cd62e04 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 20 Jun 2018 10:13:33 +0200 Subject: [PATCH 1/2] update release cycle description Signed-off-by: tobiasKaminsky --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab4ddfa93d..cabac127b4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -178,11 +178,11 @@ beware, that beta releases for an upcoming version will always use the minor and For dev the version name is in format YYYYMMDD. It is mainly as a reference for reporting bugs and is not related to stable/release candidates as it is an independent app. ## Release cycle -* for each release we choose several PRs that will be included in the next release. Currently there are many open PRs from ownCloud, but after merging them, the intention is to choose the PRs that are ready (reviewed, tested) to get them merged very soon. -* these will be merged into master, tested heavily, maybe automatic testing +* 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 on demand from the branch created with first stable release (stable-3.2.x). If changes to the library are required, we do the same: create a branch from the version used in stable release (e.g. 1.0.43) and then release a dot release (1.0.43.1). To get an idea which PRs and issues will be part of the next release simply check our [milestone plan](https://github.com/nextcloud/android/milestones) From 266c709d6232611faefccd5d14efc5c6f239ab10 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 20 Jun 2018 14:06:06 +0200 Subject: [PATCH 2/2] use semantic versioning fro lib releases too --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cabac127b4..3244434288 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -182,7 +182,7 @@ For dev the version name is in format YYYYMMDD. It is mainly as a reference for * 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 on demand from the branch created with first stable release (stable-3.2.x). If changes to the library are required, we do the same: create a branch from the version used in stable release (e.g. 1.0.43) and then release a dot release (1.0.43.1). +* Bugfix releases (dot releases, e.g. 3.2.1) are released on demand from the branch created with first stable release (stable-3.2.x). If changes to the library are required, we do the same: create a branch from the version used in stable release (e.g. 1.1.0) and then release a dot release (1.1.1). To get an idea which PRs and issues will be part of the next release simply check our [milestone plan](https://github.com/nextcloud/android/milestones)