From 4ccfa94132b56c22bfbe2deafb4847250e702202 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 3 May 2018 14:52:52 +1200 Subject: [PATCH 1/3] Removed docs about pre-semver times We no longer support those versions, so it's just noise. --- docs/en/05_Contributing/04_Release_Process.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index e92a24069..8e3e71089 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -25,10 +25,6 @@ announced on the [release announcements mailing list](http://groups.google.com/g SilverStripe follows [Semantic Versioning](http://semver.org). -Note: Until November 2014, the project didn't adhere to Semantic Versioning. Instead, a "minor release" in semver terminology -was treated as a "major release" in SilverStripe. For example, the *3.1.0* release contained API breaking changes, and -the *3.1.1* release contained new features rather than just bugfixes. - ## Supported versions At any point in time, the core development team will support a set of releases to varying levels: From 63b1f0153d719fde91c327ef515fe672ec772919 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 3 May 2018 15:19:45 +1200 Subject: [PATCH 2/3] Clarify roadmap and change releases location for docs --- docs/en/05_Contributing/04_Release_Process.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index 8e3e71089..80a485666 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -2,24 +2,28 @@ summary: Describes the process followed for "core" releases. # Release Process -This page describes the process followed for "core" releases (mainly the `framework` and `cms` modules). +This page describes the process followed for "core" releases. ## Release Planning -Releases are planned by assigning issues to GitHub milestones. +Releases are planned by assigning issues to GitHub milestones, +according to our [roadmap](http://silverstripe.org/roadmap). SilverStripe is split up into many modules listed on [github.com/silverstripe](https://github.com/silverstripe). Each of them will have its own milestones and issues, and different release lines (e.g. 1.x vs. 4.x). There are high-level "recipe" milestones on the [framework repository](https://github.com/silverstripe/silverstripe-framework/milestones) to combine individual module milestones into a larger release that's eventually available on [silverstripe.org/download](https://silverstripe.org/download). -New features and API changes are discussed on the [core mailinglist](http://groups.google.com/group/silverstripe-dev). They are prioritised by the core team as tickets on +New features and API changes are discussed as +[Github issues](https://docs.silverstripe.org/en/contributing/issues_and_bugs/)), +as well as the [forum](https://forum.silverstripe.org). +They are prioritised by the core team as tickets on github.com. In addition, we collect community feedback on [silverstripe.uservoice.com](https://silverstripe.uservoice.com). Any feature ideas we're planning to implement will be flagged there. Release dates are usually not published prior to the release, but you can get a good idea of the release status by reviewing the release milestone on github.com. Releases will be -announced on the [release announcements mailing list](http://groups.google.com/group/silverstripe-announce). +announced on the ["releases" forum category](https://forum.silverstripe.org/c/releases). ## Release Numbering @@ -27,6 +31,7 @@ SilverStripe follows [Semantic Versioning](http://semver.org). ## Supported versions +Our version support is outlined on [silverstripe.org/roadmap](http://silverstripe.org/roadmap). At any point in time, the core development team will support a set of releases to varying levels: * The current *master* will get new features, bug fixes and API changes that might require major refactoring before going @@ -120,7 +125,7 @@ timeline and ask the reporter to keep the issue confidential until we announce i * Halt all other development as long as is needed to develop a fix, including patches against the current and one previous major release (if applicable). * Pre-announce the upcoming security release to a private mailing list of important stakeholders (see below). -* We will inform you about resolution and [announce](http://groups.google.com/group/silverstripe-announce) a +* We will inform you about resolution and [announce](https://forum.silverstripe.org/c/releases) a [new release](http://silverstripe.org/security-releases/) publically. You can help us determine the problem and speed up responses by providing us with more information on how to reproduce From 10328a897044dc0b587b3e38621a7d4288c808a8 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 3 May 2018 15:20:17 +1200 Subject: [PATCH 3/3] Less conflicting statement on security fix release lines --- docs/en/05_Contributing/04_Release_Process.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index 80a485666..9f6de4446 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -2,7 +2,9 @@ summary: Describes the process followed for "core" releases. # Release Process -This page describes the process followed for "core" releases. +This page describes the process followed for "core" releases +(the modules included by [silverstripe/recipe-core](https://github.com/silverstripe/recipe-core) +and [silverstripe/recipe-cms](https://github.com/silverstripe/recipe-cms)). ## Release Planning @@ -15,7 +17,7 @@ to combine individual module milestones into a larger release that's eventually [silverstripe.org/download](https://silverstripe.org/download). New features and API changes are discussed as -[Github issues](https://docs.silverstripe.org/en/contributing/issues_and_bugs/)), +[GitHub issues](https://docs.silverstripe.org/en/contributing/issues_and_bugs/)), as well as the [forum](https://forum.silverstripe.org). They are prioritised by the core team as tickets on github.com. In addition, we collect community feedback on [silverstripe.uservoice.com](https://silverstripe.uservoice.com). @@ -35,11 +37,12 @@ Our version support is outlined on [silverstripe.org/roadmap](http://silverstrip At any point in time, the core development team will support a set of releases to varying levels: * The current *master* will get new features, bug fixes and API changes that might require major refactoring before going -into a release. At the moment, bugfixing and feature development might happen on the current major release branch (e.g. *3*), to be +into a release. At the moment, bugfixing and feature development might happen on the current major release branch (e.g. *4*), to be merged forward to master regularly. * Applicable bugfixes on master will also be merged back to the last major release branch, to be released as the next patch release -* Security fixes will be applied to the current master and the previous two major releases (e.g. *4.0*, *3.2* and *3.1*). +* Security fixes will be applied to the current master, + as well as patch releases for SilverStripe versions in "active development", "full support" or "limited support". ## Deprecation