jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

RELEASING: make sure we have an accurate version in a commit in master
This commit is contained in:
Ran Benita 2020-11-13 12:57:53 +02:00 committed by GitHub
parent 66311ff702 f6b682ad49
commit c14f498622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/main.yml vendored
View File

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

8
RELEASING.rst
View File

@ -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. #. 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 git@github.com:pytest-dev/pytest.git MAJOR.{MINOR+1}.0.dev0
#. Send an email announcement with the contents from:: #. Send an email announcement with the contents from::
doc/en/announce/release-<VERSION>.rst doc/en/announce/release-<VERSION>.rst