summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-11-22 18:21:23 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-11-22 18:21:23 +0100
commit0c54cd790e22b755cd7635c4f8e6e6393051469a (patch)
treec62930ec6a3410c2961a497074af739ef60c09ef
parent62cdb7b004a8d8306a51d8ca502a9117ded9d7db (diff)
downloadqutebrowser-0c54cd790e22b755cd7635c4f8e6e6393051469a.tar.gz
qutebrowser-0c54cd790e22b755cd7635c4f8e6e6393051469a.zip
Improve release instructions
-rw-r--r--.bumpversion.cfg2
-rw-r--r--doc/changelog.asciidoc2
-rw-r--r--doc/contributing.asciidoc3
3 files changed, 4 insertions, 3 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 17b79485a..d0c16820f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -15,6 +15,6 @@ replace = <!-- Add new releases here -->
<release version="{new_version}" date="{now:%Y-%m-%d}"/>
[bumpversion:file:doc/changelog.asciidoc]
-search = (unreleased)
+search = (today)
replace = ({now:%Y-%m-%d})
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 0d27b7886..65fd67c09 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -51,7 +51,7 @@ Fixed
- Remaining issues (mostly warnings) related to Python 3.8, especially for
QtWebKit.
-v1.8.2 (unreleased)
+v1.8.2 (today)
-------------------
Changed
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index 51e600578..355c90285 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -709,7 +709,8 @@ 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
+* Update changelog, replace correct (unreleased) by (today).
+* If necessary: Update changelog in release branch from master.
* 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.