diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-07-11 10:47:28 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-07-11 10:47:28 +0200 |
| commit | 16a591e8876c4991dc081c3885a461083596fb02 (patch) | |
| tree | eea1c6387abc09f72e93837fa81d710cf153c3f1 /doc/contributing.asciidoc | |
| parent | cabbfd84f68bef6d16780657363a2dffd1a87fb4 (diff) | |
| parent | a9f9de4b35180bf403ad996c2c0de2be6216599c (diff) | |
| download | qutebrowser-16a591e8876c4991dc081c3885a461083596fb02.tar.gz qutebrowser-16a591e8876c4991dc081c3885a461083596fb02.zip | |
Merge remote-tracking branch 'origin/pr/4304'
Diffstat (limited to 'doc/contributing.asciidoc')
| -rw-r--r-- | doc/contributing.asciidoc | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 6fe6fb740..f49d3148b 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -702,25 +702,11 @@ qutebrowser release * Make sure there are no unstaged changes and the tests are green. * Make sure all issues with the related milestone are closed. -* Run `x=... y=...` to set the respective shell variables. - -* Update changelog (remove *(unreleased)*). -* Adjust `__version_info__` in `qutebrowser/__init__.py`. +* Update changelog (remove *(unreleased)*) and commit. * Consider updating the completions for `content.headers.user_agent` in `configdata.yml`. -* Commit. - -* Create annotated git tag (`git tag -s "v1.$x.$y" -m "Release v1.$x.$y"`). -* `git push origin`; `git push origin v1.$x.$y`. * If committing on minor branch, cherry-pick release commit to master. -* Create release on github. -* Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones -as closed. - -* Linux: Run `git checkout v1.$x.$y && ./.venv/bin/python3 scripts/dev/build_release.py --upload v1.$x.$y`. -* Windows: Run `git checkout v1.X.Y; py -3 scripts\dev\build_release.py --asciidoc C:\Python27\python %userprofile%\bin\asciidoc-8.6.10\asciidoc.py --upload v1.X.Y` (replace X/Y by hand). -* macOS: Run `git checkout v1.X.Y && python3 scripts/dev/build_release.py --upload v1.X.Y` (replace X/Y by hand). -* On server: - - Run `bash download_release.sh 1.X.Y` (replace X/Y by hand). - - Run `git pull github master && sudo python3 scripts/asciidoc2html.py --website /srv/http/qutebrowser` +* 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 the printed instructions accordingly. * Update `qutebrowser-git` PKGBUILD if dependencies/install changed. * Announce to qutebrowser and qutebrowser-announce mailinglist. |