Updated Scrapy release procedure (markdown)

Daniel Graña 2013-11-08 23:42:24 -08:00
parent 6891d501b4
commit 42f58a10d2
1 changed files with 19 additions and 19 deletions

@ -7,17 +7,17 @@ This page outlines the procedure used to release a new (major/minor) version of
Here is an example, assuming we are releasing 0.20.0:
```bash
$ git checkout -b 0.20 master
# edit scrapy/VERSION and modify version to 0.20.0
# edit docs/news.rst and set release date for 0.20
$ git commit -a -m "bumped version to 0.20.0"
$ git tag -a -m "version 0.20.0" 0.20.0
$ git push origin 0.20 --tags
$ git checkout -b 0.22 master
# edit scrapy/VERSION and modify version to 0.22.0
# edit docs/news.rst and set release date for 0.22
$ git commit -a -m "bumped version to 0.22.0"
$ git tag -a -m "version 0.22.0" 0.22.0
$ git push origin 0.22 --tags
$ git checkout master
# edit scrapy/VERSION and modify version to 0.21.0
$ git commit -a -m "bumped version to 0.21.0"
$ git tag -a -m "version 0.18.0" 0.21.0
# edit scrapy/VERSION and modify version to 0.23.0
$ git commit -a -m "bumped version to 0.23.0"
$ git tag -a -m "version 0.23.0" 0.23.0
$ git push origin master --tags
```
@ -47,27 +47,27 @@ $ git push origin master --tags
## Micro/bugfix releases
Assuming we are releasing `0.18.3`:
Assuming we are releasing `0.20.1`:
```bash
$ git checkout 0.18
$ git checkout 0.20
# Edit `scrapy/VERSION` and modify version to `0.18.3`
# Edit `scrapy/VERSION` and modify version to `0.20.1`
$ git add scrapy/VERSION
$ git commit -m "bumped version to 0.18.3"
$ git commit -m "bumped version to 0.20.1"
# Add version, release date and changes to `docs/news.rst`
$ git log '--format=- %s (:commit:`%h`)' 0.18.2...0.18 # update docs/news.rst
$ git log '--format=- %s (:commit:`%h`)' 0.20.0...0.20 # update docs/news.rst
$ git add docs/news.rst
$ git commit -m 'Add 0.18.3 release notes'
$ git commit -m 'Add 0.20.1 release notes'
# Tag and push
$ git tag -a -m "version 0.18.3" 0.18.3
$ git push origin 0.18 --tags
# It triggers scrapy-0.18 builder and publish pypi sources and debian packages automatically
$ git tag -a -m "version 0.20.1" 0.20.1
$ git push origin 0.20 --tags
# It triggers scrapy-0.20 builder and publish pypi sources and debian packages automatically
# Checkout master and cherry pick `docs/news.rst` changes.
$ git checkout master
$ git cherry-pick 0.18 # resolve any conflicts on docs/news.rst
$ git cherry-pick 0.20 # resolve any conflicts on docs/news.rst
$ git push origin master
```