diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-09-27 13:42:10 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-09-27 13:42:30 +0200 |
| commit | a6c38e1148a1a0967385259ba92dcf4bdd32a2d9 (patch) | |
| tree | 3fa8ca47687c672acd7dfaad4c1a0ebea88f4660 | |
| parent | 3966220977229e14435b68f70056af714a92a800 (diff) | |
| download | qutebrowser-a6c38e1148a1a0967385259ba92dcf4bdd32a2d9.tar.gz qutebrowser-a6c38e1148a1a0967385259ba92dcf4bdd32a2d9.zip | |
Further improve release instructions
(cherry picked from commit a3ec34b55db4ee46f3cb67a277b84f335ae5c992)
| -rw-r--r-- | doc/contributing.asciidoc | 1 | ||||
| -rw-r--r-- | scripts/dev/update_version.py | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 84e9a17d0..d2a4d9328 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -705,6 +705,7 @@ qutebrowser release * Consider updating the completions for `content.headers.user_agent` in `configdata.yml`. * Make sure Python is up-to-date on build machines. * Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones as closed. +* Update changelog * Run `./.venv/bin/python3 scripts/dev/update_version.py {major,minor,patch}`. * Run the printed instructions accordingly. * Update `qutebrowser-git` PKGBUILD if dependencies/install changed. diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index 8eb85081a..0b358544d 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -67,16 +67,16 @@ if __name__ == "__main__": print("* git push origin; git push origin v{v}".format(v=version)) if args.bump == 'patch': print("* git checkout master && git cherry-pick v{v} && " - "git push origin.".format(v=version)) + "git push origin".format(v=version)) else: print("* git branch v{x} v{v} && git push origin v{x}" .format(v=version, x=x_version)) print("* Create new release via GitHub (required to upload release " - "artifacts).") + "artifacts)") print("* Linux: git pull && git checkout v{v} && " "./.venv/bin/python3 scripts/dev/build_release.py --upload" .format(v=version)) - print("* Windows: git pull && git checkout v{v}; " + print("* Windows: git pull; git checkout v{v}; " "py -3 scripts\\dev\\build_release.py --asciidoc " "C:\\Python27\\python " "$env:userprofile\\bin\\asciidoc-8.6.10\\asciidoc.py --upload" @@ -86,7 +86,7 @@ if __name__ == "__main__": .format(v=version)) print("* On server:") - print(" - python3 scripts/dev/download_release.py {v}" + print(" - bash download_release.sh {v}" .format(v=version)) print(" - git pull github master && sudo python3 " "scripts/asciidoc2html.py --website /srv/http/qutebrowser") |