From 3b6f1b5c583c7cce9fff4aad96d955397a2416fe Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 9 Oct 2019 07:28:42 +0200 Subject: [PATCH 1/2] Note about bug fix release schedule Signed-off-by: tobiasKaminsky --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a0a72e19bf8..6441c0ba65be 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,7 +122,7 @@ There are three build variants ### 2. Create pull request: * Commit your changes locally: ```git commit -a``` * Push your changes to your GitHub repo: ```git push``` -* Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request +* Browse to and issue pull request * Enter description and send pull request. @@ -294,7 +294,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.1.0) and then release a dot release (1.1.1). +* 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.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) From fe07963299eae9a15c93063a2cebf4b4618d59ae Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 10 Oct 2019 18:11:19 +0200 Subject: [PATCH 2/2] add imfo about hotfix and security fix releases Signed-off-by: Andy Scherzinger --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6441c0ba65be..a57f5b423d30 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -296,6 +296,8 @@ For dev the version name is in format YYYYMMDD. It is mainly as a reference for * 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.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). +> 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. + 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) ## Release process