Merge pull request #7908 from bluetech/post-release-tag

RELEASING: make sure we have an accurate version in a commit in master

Author: bluetech

.github/workflows/main.yml

@@ -6,7 +6,8 @@ on:
       - master
       - "[0-9]+.[0-9]+.x"
     tags:
-      - "*"
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
 
   pull_request:
     branches:

RELEASING.rst

@@ -122,6 +122,14 @@ Both automatic and manual processes described above follow the same steps from t
 
 #. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step.
 
+#. For major and minor releases, tag the release cherry-pick merge commit in master with
+   a dev tag for the next feature release::
+
+       git checkout master
+       git pull
+       git tag MAJOR.{MINOR+1}.0.dev0
+       git push [email protected]:pytest-dev/pytest.git MAJOR.{MINOR+1}.0.dev0
+
 #. Send an email announcement with the contents from::
 
      doc/en/announce/release-<VERSION>.rst