From 2fb4fe5c1d05a7f0941eb0394ccb04339aaaaad5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Aug 2023 12:18:11 +0200 Subject: [PATCH 01/12] Update releasing docs --- doc/contributing.asciidoc | 18 +++++++++++++++--- scripts/dev/update_version.py | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index aa0c7516a..0be2655c5 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -758,18 +758,30 @@ qutebrowser release * Make sure there are no unstaged changes and the tests are green. * Make sure all issues with the related milestone are closed. +* Mark the https://github.com/qutebrowser/qutebrowser/milestones[milestone] as closed. * Consider updating the completions for `content.headers.user_agent` in `configdata.yml`. * Minor release: Consider updating some files from main: - `misc/requirements/` and `requirements.txt` - `scripts/` -* Make sure Python is up-to-date on build machines. -* Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones as closed. -* Update changelog in main branch +* Update changelog in main branch and ensure the correct version number has `(unreleased)` * If necessary: Update changelog in release branch from main. + +**Automatic release via GitHub Actions (starting with v3.0.0):** + +* Double check Python version in `.github/workflows/release.yml` +* Run the `release` workflow on the `main` branch, e.g. via `gh workflow run release -f release_type=major` (`release_type` can be `major`, `minor` or `patch`; you can also override `python_version`) + +**Manual release:** + +* Make sure Python is up-to-date on build machines. * Run `./.venv/bin/python3 scripts/dev/update_version.py {major,minor,patch}`. * Run the printed instructions accordingly. + +**Post release:** + * Update `qutebrowser-git` PKGBUILD if dependencies/install changed. * Add unreleased future versions to changelog * Update IRC topic * Announce to qutebrowser and qutebrowser-announce mailinglist. * Post announcement mail to subreddit +* Post on the website formerly known as Twitter diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index 424a77559..b0f48710e 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -100,7 +100,7 @@ def show_commit(): "tox -e build-release -- --upload" .format(v=version)) print("* Windows: git fetch; git checkout v{v}; " - "py -3.9 -m tox -e build-release -- --upload" + "py -3.X -m tox -e build-release -- --upload" .format(v=version)) print("* macOS: git fetch && git checkout v{v} && " "tox -e build-release -- --upload" From 348fe28b24508266ba02e687297c0ef98a39ec4d Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Thu, 17 Aug 2023 10:51:26 +0000 Subject: [PATCH 02/12] Release v3.0.0 --- .bumpversion.cfg | 2 +- doc/changelog.asciidoc | 2 +- misc/org.qutebrowser.qutebrowser.appdata.xml | 1 + qutebrowser/__init__.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index af19f0185..fcaf46306 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.5.4 +current_version = 3.0.0 commit = True message = Release v{new_version} tag = True diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 30fbfb8fd..0658e8bfd 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -16,7 +16,7 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Security` to invite users to upgrade in case of vulnerabilities. [[v3.0.0]] -v3.0.0 (unreleased) +v3.0.0 (2023-08-17) ------------------- Major changes diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index 32a19effa..1b7da2353 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -44,6 +44,7 @@ + diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index 502c713fe..efdf91b3e 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -11,7 +11,7 @@ __license__ = "GPL" __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" -__version__ = "2.5.4" +__version__ = "3.0.0" __version_info__ = tuple(int(part) for part in __version__.split('.')) __description__ = "A keyboard-driven, vim-like browser based on Python and Qt." From b3551b4277a1b8d1ae12e679016bbba23c4b9edd Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Aug 2023 13:00:31 +0200 Subject: [PATCH 03/12] changelog --- doc/changelog.asciidoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 0658e8bfd..8b6cdfb14 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,6 +15,9 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. +v4.0.0 (unreleased) +------------------ + [[v3.0.0]] v3.0.0 (2023-08-17) ------------------- From 0100f2680dc3669e220b942eef36fd1fcbc2f554 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Thu, 17 Aug 2023 11:01:39 +0000 Subject: [PATCH 04/12] Release v4.0.0 --- .bumpversion.cfg | 2 +- doc/changelog.asciidoc | 2 +- misc/org.qutebrowser.qutebrowser.appdata.xml | 1 + qutebrowser/__init__.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fcaf46306..41dc1c82c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.0.0 +current_version = 4.0.0 commit = True message = Release v{new_version} tag = True diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 8b6cdfb14..10dc84e29 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,7 +15,7 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. -v4.0.0 (unreleased) +v4.0.0 (2023-08-17) ------------------ [[v3.0.0]] diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index 1b7da2353..f41189533 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -44,6 +44,7 @@ + diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index efdf91b3e..3637dbee8 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -11,7 +11,7 @@ __license__ = "GPL" __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" -__version__ = "3.0.0" +__version__ = "4.0.0" __version_info__ = tuple(int(part) for part in __version__.split('.')) __description__ = "A keyboard-driven, vim-like browser based on Python and Qt." From fc422059fc3522748ef550633978a02264414929 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Aug 2023 13:18:08 +0200 Subject: [PATCH 05/12] Update changelog from release branch --- doc/changelog.asciidoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 10dc84e29..1c0488817 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,6 +15,9 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. +v4.0.1 (unreleased) +------------------- + v4.0.0 (2023-08-17) ------------------ From abbe4038fce3247e9b0f6aed7a8463b4ea55ee0e Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Thu, 17 Aug 2023 11:19:07 +0000 Subject: [PATCH 06/12] Release v4.1.0 --- .bumpversion.cfg | 2 +- doc/changelog.asciidoc | 2 +- misc/org.qutebrowser.qutebrowser.appdata.xml | 1 + qutebrowser/__init__.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 41dc1c82c..5b74be27f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.0 +current_version = 4.1.0 commit = True message = Release v{new_version} tag = True diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 1c0488817..41fc1f2ed 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,7 +15,7 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. -v4.0.1 (unreleased) +v4.0.1 (2023-08-17) ------------------- v4.0.0 (2023-08-17) diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index f41189533..95580e85a 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -44,6 +44,7 @@ + diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index 3637dbee8..cfafbb952 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -11,7 +11,7 @@ __license__ = "GPL" __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" -__version__ = "4.0.0" +__version__ = "4.1.0" __version_info__ = tuple(int(part) for part in __version__.split('.')) __description__ = "A keyboard-driven, vim-like browser based on Python and Qt." From 4777eeeb21923b98d1b59f0569fc9fc09579b74b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Aug 2023 13:40:17 +0200 Subject: [PATCH 07/12] Update changelog --- doc/changelog.asciidoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 41fc1f2ed..7684576ea 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,7 +15,10 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. -v4.0.1 (2023-08-17) +v4.1.1 (unreleased) +------------------- + +v4.1.0 (2023-08-17) ------------------- v4.0.0 (2023-08-17) From eaad7e30172b757e4738e09d3603f91be72c2957 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Thu, 17 Aug 2023 11:41:37 +0000 Subject: [PATCH 08/12] Release v4.1.1 (cherry picked from commit 20f37d9373565b4298b5b25095626a966666eb08) --- .bumpversion.cfg | 2 +- doc/changelog.asciidoc | 2 +- misc/org.qutebrowser.qutebrowser.appdata.xml | 1 + qutebrowser/__init__.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5b74be27f..b5d439331 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.0 +current_version = 4.1.1 commit = True message = Release v{new_version} tag = True diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 7684576ea..29836c4f6 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,7 +15,7 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. -v4.1.1 (unreleased) +v4.1.1 (2023-08-17) ------------------- v4.1.0 (2023-08-17) diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index 95580e85a..f4f1dcf26 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -44,6 +44,7 @@ + diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index cfafbb952..30b380864 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -11,7 +11,7 @@ __license__ = "GPL" __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" -__version__ = "4.1.0" +__version__ = "4.1.1" __version_info__ = tuple(int(part) for part in __version__.split('.')) __description__ = "A keyboard-driven, vim-like browser based on Python and Qt." From 8367a865376aea4eadf673cafba5db47c14f7160 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 17 Aug 2023 14:00:10 +0200 Subject: [PATCH 09/12] changelog --- doc/changelog.asciidoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 29836c4f6..02e6e0cbd 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,6 +15,9 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. +4.2.0 (unreleased) +------------------ + v4.1.1 (2023-08-17) ------------------- From 38504fa3348201bf062963c85e2a044c67f540c1 Mon Sep 17 00:00:00 2001 From: qutebrowser bot Date: Thu, 17 Aug 2023 12:01:43 +0000 Subject: [PATCH 10/12] Release v4.2.0 --- .bumpversion.cfg | 2 +- doc/changelog.asciidoc | 2 +- misc/org.qutebrowser.qutebrowser.appdata.xml | 1 + qutebrowser/__init__.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b5d439331..31a69359e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.1 +current_version = 4.2.0 commit = True message = Release v{new_version} tag = True diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index 02e6e0cbd..d76ec041c 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -15,7 +15,7 @@ breaking changes (such as renamed commands) can happen in minor releases. // `Fixed` for any bug fixes. // `Security` to invite users to upgrade in case of vulnerabilities. -4.2.0 (unreleased) +4.2.0 (2023-08-17) ------------------ v4.1.1 (2023-08-17) diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index f4f1dcf26..f940596b9 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -44,6 +44,7 @@ + diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index 30b380864..51b13263c 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -11,7 +11,7 @@ __license__ = "GPL" __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" -__version__ = "4.1.1" +__version__ = "4.2.0" __version_info__ = tuple(int(part) for part in __version__.split('.')) __description__ = "A keyboard-driven, vim-like browser based on Python and Qt." From b9630c081dab3721d78ceed0e9168db88b18fdd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:21:18 +0000 Subject: [PATCH 11/12] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/bleeding.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/docker.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/recompile-requirements.yml | 2 +- .github/workflows/release.yml | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml index 8f8cddc1e..2587d832b 100644 --- a/.github/workflows/bleeding.yml +++ b/.github/workflows/bleeding.yml @@ -32,7 +32,7 @@ jobs: - /home/runner/work/_temp/:/home/runner/work/_temp/ options: --privileged --tty steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Set up problem matchers diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14d642491..9d7963ea7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - testenv: actionlint - testenv: package steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - uses: actions/cache@v3 @@ -112,7 +112,7 @@ jobs: - /home/runner/work/_temp/:/home/runner/work/_temp/ options: --privileged --tty steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Set up problem matchers @@ -181,7 +181,7 @@ jobs: python: "3.9" runs-on: "${{ matrix.os }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - uses: actions/cache@v3 @@ -229,7 +229,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: Initialize CodeQL diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c8161b37d..2707e3d9d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,7 +18,7 @@ jobs: - archlinux-webengine-unstable-qt6 - archlinux-webengine-qt6 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.x' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 18c12e053..76332e8ba 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -50,7 +50,7 @@ jobs: runs-on: "${{ matrix.os }}" timeout-minutes: 45 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "${{ matrix.branch }}" persist-credentials: false diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml index b06ea614d..f33edd670 100644 --- a/.github/workflows/recompile-requirements.yml +++ b/.github/workflows/recompile-requirements.yml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 20 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Set up Python 3.8 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c5b6d4b1..b5ba2a652 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: console.log(`sorted: ${sorted}`); return sorted.at(-1); result-encoding: string - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: @@ -78,7 +78,7 @@ jobs: git config --global user.name "qutebrowser bot" git config --global user.email "bot@qutebrowser.org" - name: Switch to release branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ steps.find-branch.outputs.result }} - name: Import GPG Key @@ -138,7 +138,7 @@ jobs: permissions: contents: write # To upload release artifacts steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: v${{ needs.prepare.outputs.version }} - name: Set up Python From 6ca4201f8c2874768e4362f76ba719b3c3f48538 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:50:16 +0000 Subject: [PATCH 12/12] build(deps): bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2707e3d9d..9f3c273fd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,7 +31,7 @@ jobs: with: username: qutebrowser password: ${{ secrets.DOCKER_TOKEN }} - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: file: scripts/dev/ci/docker/Dockerfile context: .