From 1f881f5c3f704f71108c0348eacd1a0473b5a4fe Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 5 Sep 2018 13:57:40 +1200 Subject: [PATCH] DOCS Clarify sec release process --- docs/en/05_Contributing/04_Release_Process.md | 2 ++ .../en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/05_Contributing/04_Release_Process.md b/docs/en/05_Contributing/04_Release_Process.md index 9d3e24033..90fdad402 100644 --- a/docs/en/05_Contributing/04_Release_Process.md +++ b/docs/en/05_Contributing/04_Release_Process.md @@ -182,6 +182,8 @@ Follow these instructions in sequence as much as possible: * Send out a note on the pre-announce list with a highlevel description of the issue and impact (usually a copy of the yet unpublished security release page on silverstripe.org) * Link to silverstripe.org security release page in the changelog. * Move the issue to "Awaiting Release" in the [project board](https://github.com/silverstripe-security/security-issues/projects/1) + * Perform release + * Follow the steps for [making a core release](making-a-silverstripe-core-release) * After release * Publish silverstripe.org security release page * Respond to issue reporter with reference to the release on the same discussion thread (cc security@silverstripe.org) diff --git a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md index 171d30505..703b356e6 100644 --- a/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md +++ b/docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md @@ -161,7 +161,7 @@ Check all tickets assigned to that milestone are either closed or reassigned to Use the [list of all issues across modules](https://www.silverstripe.org/community/contributing-to-silverstripe/github-all-core-issues) as a starting point, and add a `milestone:"your-milestone"` filter. -Merge up from other older supported release branches (e.g. merge `3.1`->`3.2`, `3.2`->`3.3`, `3.3`->`3`, `3`->`master`). +Merge up from other older [supported release branches](release-process#supported-versions) (e.g. merge `3.1`->`3.2`, `3.2`->`3.3`, `3.3`->`3`, `3`->`master`). This is the part of the release that prepares and tests everything locally, but doe not make any upstream changes (so it's safe to run without worrying about