From ed7f021a848618c6d833a6dcb7cb5b139908b965 Mon Sep 17 00:00:00 2001 From: jcass77 Date: Sun, 9 Aug 2020 05:59:13 +0200 Subject: [PATCH] docs: Update release procedures. --- docs/releasing.md | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/docs/releasing.md b/docs/releasing.md index d5f56c3..d14e6d3 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -6,23 +6,13 @@ key individuals, and as a stepping stone to more automation. ## Creating releases -1. Update changelog and bump the version number in `setup.py`. Commit changes. +1. Update changelog and commit it. -2. Merge the release branch (``develop`` in the example) into master: +2. Bump the version number in `setup.py` and commit changes. - git checkout master - git merge --no-ff -m "Release v0.3.0" develop +3. Push to GitHub. -3. Tag the release: +4. Create a new release on GitHub: https://github.com/jarekwg/django-apscheduler/releases/new - git tag -a -m "Release v0.3.0" v0.3.0 - -4. Push to GitHub: - - git push --follow-tags - -5. Merge ``master`` back into ``develop`` and push the branch to GitHub. - -6. Document the release on GitHub by clicking on the 'Releases' link on the landing page, - and editing the tag that was just created. Set both the tag version and release title - to "v0.3.0". + - Set both tag version and release title to the semantic version number (e.g. "0.4.1") + - Clicking "Publish" will automatically trigger a new release to get pushed to PyPi. \ No newline at end of file