From 3afe29321ac7603c996e000e2ff6380ae7af0aab Mon Sep 17 00:00:00 2001 From: marco-ippolito Date: Tue, 26 Mar 2024 12:37:28 +0100 Subject: [PATCH 1/7] feat: document beta releases expectations --- Release-Process.md | 7 +++++++ Security.md | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/Release-Process.md b/Release-Process.md index 55e62189250..9ea0cf3212e 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -77,6 +77,13 @@ non-patch flow. - This branch contains the commits accepted so far that implement the proposal in the tracking pull request. +### Beta releases + +Beta releases are made from a proposal branch. The version number should be +incremented to the next minor version with a `-beta` suffix. For example, if the +next release is `5.0.1`, the beta release would be `5.0.1-beta.0`. The beta +release should be considered unstable and not suitable for production use. + ### Patch flow In the patch flow, simple changes are committed to the release branch which diff --git a/Security.md b/Security.md index cdcd7a6e0aa..d1c4bb7f022 100644 --- a/Security.md +++ b/Security.md @@ -29,6 +29,12 @@ announcement, and may ask for additional information or guidance. Report security bugs in third-party modules to the person or team maintaining the module. +## Beta releases + +Beta releases should be considered unstable and **not suitable for production use**. +Vulnerabilities found in beta releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. +Due to the unstable nature of the branch it is not garanteed that the fix will be released in the next beta release. + ## Disclosure Policy When the security team receives a security bug report, they will assign it to a From 8c13078dd1ef9aeb7f200e82e562d7477eb46271 Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Tue, 26 Mar 2024 15:32:34 +0100 Subject: [PATCH 2/7] Update Release-Process.md Co-authored-by: Wes Todd --- Release-Process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release-Process.md b/Release-Process.md index 9ea0cf3212e..0b95a6f3a7d 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -77,7 +77,7 @@ non-patch flow. - This branch contains the commits accepted so far that implement the proposal in the tracking pull request. -### Beta releases +### Pre-release Versions Beta releases are made from a proposal branch. The version number should be incremented to the next minor version with a `-beta` suffix. For example, if the From 31d828ac4868b2ae5df2c0c4f3e2053ee36c4fda Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Tue, 26 Mar 2024 15:41:07 +0100 Subject: [PATCH 3/7] Update Security.md Co-authored-by: Wes Todd --- Security.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Security.md b/Security.md index d1c4bb7f022..9a9986d73ca 100644 --- a/Security.md +++ b/Security.md @@ -29,7 +29,7 @@ announcement, and may ask for additional information or guidance. Report security bugs in third-party modules to the person or team maintaining the module. -## Beta releases +## Pre-release Versions Beta releases should be considered unstable and **not suitable for production use**. Vulnerabilities found in beta releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. From eb386fb139c4c2facc51affb5554da5d29997797 Mon Sep 17 00:00:00 2001 From: marco-ippolito Date: Tue, 26 Mar 2024 15:44:10 +0100 Subject: [PATCH 4/7] refactor: reword to pre-releases --- Release-Process.md | 8 ++++---- Security.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Release-Process.md b/Release-Process.md index 0b95a6f3a7d..c74f16f08b2 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -79,10 +79,10 @@ non-patch flow. ### Pre-release Versions -Beta releases are made from a proposal branch. The version number should be -incremented to the next minor version with a `-beta` suffix. For example, if the -next release is `5.0.1`, the beta release would be `5.0.1-beta.0`. The beta -release should be considered unstable and not suitable for production use. +Alpha and Beta releases are made from a proposal branch. The version number should be +incremented to the next minor version with a `-beta` or `-alpha` suffix. +For example, if the next beta release is `5.0.1`, the beta release would be `5.0.1-beta.0`. +The pre-releases should be considered unstable and not suitable for production use. ### Patch flow diff --git a/Security.md b/Security.md index 9a9986d73ca..d49ddd75a24 100644 --- a/Security.md +++ b/Security.md @@ -31,9 +31,9 @@ the module. ## Pre-release Versions -Beta releases should be considered unstable and **not suitable for production use**. -Vulnerabilities found in beta releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. -Due to the unstable nature of the branch it is not garanteed that the fix will be released in the next beta release. +Alpha and Beta releases should be considered unstable and **not suitable for production use**. +Vulnerabilities found in pre-releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. +Due to the unstable nature of the branch it is not garanteed that the fix will be released in the next pre-release. ## Disclosure Policy From 84bcdc00b740b5a76e453b682ac7e5077434fd87 Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Tue, 26 Mar 2024 17:01:11 +0100 Subject: [PATCH 5/7] Update Release-Process.md Co-authored-by: Chris de Almeida --- Release-Process.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release-Process.md b/Release-Process.md index c74f16f08b2..9ca0a15ab46 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -82,7 +82,7 @@ non-patch flow. Alpha and Beta releases are made from a proposal branch. The version number should be incremented to the next minor version with a `-beta` or `-alpha` suffix. For example, if the next beta release is `5.0.1`, the beta release would be `5.0.1-beta.0`. -The pre-releases should be considered unstable and not suitable for production use. +The pre-releases are unstable and not suitable for production use. ### Patch flow From d8b0f17eca6d444a846aa80aeb9b567e604e5b7a Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Tue, 26 Mar 2024 17:01:17 +0100 Subject: [PATCH 6/7] Update Security.md Co-authored-by: Chris de Almeida --- Security.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Security.md b/Security.md index d49ddd75a24..99e8d537734 100644 --- a/Security.md +++ b/Security.md @@ -31,7 +31,7 @@ the module. ## Pre-release Versions -Alpha and Beta releases should be considered unstable and **not suitable for production use**. +Alpha and Beta releases are unstable and **not suitable for production use**. Vulnerabilities found in pre-releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. Due to the unstable nature of the branch it is not garanteed that the fix will be released in the next pre-release. From ab5b12edf180316295229dc0befaa8d8ffe2a6f8 Mon Sep 17 00:00:00 2001 From: Marco Ippolito Date: Tue, 26 Mar 2024 17:01:30 +0100 Subject: [PATCH 7/7] Update Security.md Co-authored-by: Chris de Almeida --- Security.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Security.md b/Security.md index 99e8d537734..39f055b3b96 100644 --- a/Security.md +++ b/Security.md @@ -33,7 +33,7 @@ the module. Alpha and Beta releases are unstable and **not suitable for production use**. Vulnerabilities found in pre-releases should be reported according to the [Reporting a Bug](#reporting-a-bug) section. -Due to the unstable nature of the branch it is not garanteed that the fix will be released in the next pre-release. +Due to the unstable nature of the branch it is not guaranteed that any fixes will be released in the next pre-release. ## Disclosure Policy