summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2023-03-08 14:29:55 +0100
committerGitHub <noreply@github.com>2023-03-08 14:29:55 +0100
commit395042b4700ee8e23025bb7401221a5c0d32e5a7 (patch)
tree92dc38ed7375f9e992dd9a49ba70891b1ad96c1f
parentaa395604033e2e45e401dd27aeb6864658c629de (diff)
downloadpylint-git-395042b4700ee8e23025bb7401221a5c0d32e5a7.tar.gz
[release documentation] Upgrade for post release branch deletion (#8399)
-rw-r--r--doc/development_guide/contributor_guide/release.md6
-rw-r--r--doc/whatsnew/3/index.rst2
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/development_guide/contributor_guide/release.md b/doc/development_guide/contributor_guide/release.md
index a076838fd..ea8cf0bf7 100644
--- a/doc/development_guide/contributor_guide/release.md
+++ b/doc/development_guide/contributor_guide/release.md
@@ -39,8 +39,12 @@ branch
- Push the tag.
- Release the version on GitHub with the same name as the tag and copy and paste the
appropriate changelog in the description. This triggers the PyPI release.
-- Delete the `maintenance/X.Y-1.x` branch. (For example: `maintenance/2.3.x`)
- Create a `maintenance/X.Y.x` (For example: `maintenance/2.4.x` from the `v2.4.0` tag.)
+- Upgrade the pattern for the protected branches in the settings under `Branches` /
+ `Branch protection rules`. (For example: `maintenance/2.4*` instead of
+ `maintenance/2.3*`.). There's a lot of configuration done in these settings, do NOT
+ recreate it from scratch.
+- Delete the `maintenance/X.Y-1.x` branch. (For example: `maintenance/2.3.x`)
- Close the current milestone and create the new ones (For example: close `2.4.0`,
create `2.4.1` and `2.6.0`)
- Hide and deactivate all the patch releases for the previous minor release on
diff --git a/doc/whatsnew/3/index.rst b/doc/whatsnew/3/index.rst
index f3c9ff17e..ff4aaf3dc 100644
--- a/doc/whatsnew/3/index.rst
+++ b/doc/whatsnew/3/index.rst
@@ -1,8 +1,6 @@
3.x
===
-.. include:: ../summary_explanation.rst
-
.. toctree::
:maxdepth: 2