Improve contributing.asciidoc and return git release tag from update_version.py

This commit is contained in:
Andy Mender 2018-10-08 22:08:18 +02:00
parent b684070bc9
commit a2856bee2b
2 changed files with 7 additions and 6 deletions

View File

@ -699,15 +699,14 @@ qutebrowser release
* Update changelog (remove *(unreleased)*) and commit.
* If committing on minor branch, cherry-pick release commit to master.
* Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones as closed.
* Run `./.venv/bin/python3 scripts/dev/update_version.py major | minor | patch`.
* Run 'git push origin'.
* Run `VERSION_TAG=$(./.venv/bin/python3 scripts/dev/update_version.py major | minor | patch)`.
* Run `git push origin; git push $VERSION_TAG`.
* Create new release via GitHub (required to upload release artifacts).
* Linux: run `./.venv/bin/python3 scripts/dev/build_release.py --upload`.
* Windows: Run `py -3 scripts\dev\build_release.py --asciidoc C:\Python27\python %userprofile%\bin\asciidoc-8.6.10\asciidoc.py --upload`.
* macOS: Run `python3 scripts/dev/build_release.py --upload`.
* Linux: Run `git checkout $VERSION_TAG && ./.venv/bin/python3 scripts/dev/build_release.py --upload`.
* Windows: Run `git checkout $VERSION_TAG; py -3 scripts\dev\build_release.py --asciidoc C:\Python27\python %userprofile%\bin\asciidoc-8.6.10\asciidoc.py --upload`.
* macOS: Run `git checkout $VERSION_TAG && python3 scripts/dev/build_release.py --upload`.
* On server:
- Run `python3 scripts/dev/download_release.py v1.X.Y` (replace X/Y by hand).
- Run `git pull github master && sudo python3 scripts/asciidoc2html.py --website /srv/http/qutebrowser`
* Create release on github.
* Update `qutebrowser-git` PKGBUILD if dependencies/install changed.
* Announce to qutebrowser and qutebrowser-announce mailinglist.

View File

@ -98,3 +98,5 @@ if __name__ == "__main__":
add_release(releases_block, __version__, datetime.date.today().isoformat())
write_appdata(appdata_tree)
print(__version__)