From a2856bee2bf4a39bfa0f036e3dd08e9abd590120 Mon Sep 17 00:00:00 2001 From: Andy Mender Date: Mon, 8 Oct 2018 22:08:18 +0200 Subject: [PATCH] Improve contributing.asciidoc and return git release tag from update_version.py --- doc/contributing.asciidoc | 11 +++++------ scripts/dev/update_version.py | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 7c12d6083..bda68689c 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -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. diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index f3336780b..a24ae106f 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -98,3 +98,5 @@ if __name__ == "__main__": add_release(releases_block, __version__, datetime.date.today().isoformat()) write_appdata(appdata_tree) + + print(__version__)