From 05a72d335ab3c763856f990c40453b2be70969e9 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 26 Aug 2023 12:33:01 +0200 Subject: [PATCH] Release v2.4.5 (#4787) * Update documentation for Ubuntu PPA & appdata.xml updates --- .CI/chatterino-installer.iss | 2 +- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- docs/make-release.md | 16 ++++++++++++++-- resources/com.chatterino.chatterino.appdata.xml | 3 +++ src/common/Version.hpp | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.CI/chatterino-installer.iss b/.CI/chatterino-installer.iss index 108775536..34056571e 100644 --- a/.CI/chatterino-installer.iss +++ b/.CI/chatterino-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Chatterino" -#define MyAppVersion "2.4.4" +#define MyAppVersion "2.4.5" #define MyAppPublisher "Chatterino Team" #define MyAppURL "https://www.chatterino.com" #define MyAppExeName "chatterino.exe" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ada5750b..420f6d5d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unversioned +## 2.4.5 + - Major: AutoMod term management messages (e.g. testaccount added "noob" as a blocked term on AutoMod.) are now hidden in Streamer Mode if you have the "Hide moderation actions" setting enabled. (#4758) - Minor: Added `/shoutout ` command to shoutout a specified user. Note: This is only the /command, we are still unable to display when a shoutout happens. (#4638) - Minor: Added a setting to only show tabs with live channels (default toggle hotkey: Ctrl+Shift+L). (#4358) diff --git a/CMakeLists.txt b/CMakeLists.txt index db82c9ed0..caa3990b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/sanitizers-cmake/cmake" ) -project(chatterino VERSION 2.4.4) +project(chatterino VERSION 2.4.5) option(BUILD_APP "Build Chatterino" ON) option(BUILD_TESTS "Build the tests for Chatterino" OFF) diff --git a/docs/make-release.md b/docs/make-release.md index 2cea79618..4fa0993eb 100644 --- a/docs/make-release.md +++ b/docs/make-release.md @@ -1,11 +1,23 @@ # Checklist for making a release +## In the release PR + - [ ] Updated version code in `src/common/Version.hpp` - [ ] Updated version code in `CMakeLists.txt` This can only be "whole versions", so if you're releasing `2.4.0-beta` you'll need to condense it to `2.4.0` -- [ ] Updated version code in `resources/com.chatterino.chatterino.appdata.xml` +- [ ] Add a new release at the top of of the `releases` key in `resources/com.chatterino.chatterino.appdata.xml` This cannot use dash to denote a pre-release identifier, you have to use a tilde instead. + - [ ] Updated version code in `.CI/chatterino-installer.iss` - [ ] Update the changelog `## Unreleased` section to the new version `CHANGELOG.md` Make sure to leave the `## Unreleased` line unchanged for easier merges -- [ ] Push directly to master :tf: + +## After the PR has been merged + +- [ ] Tag the release +- [ ] Manually run the [create-installer](https://github.com/Chatterino/chatterino2/actions/workflows/create-installer.yml) workflow. + This is only necessary if the tag was created after the CI in the main branch finished. +- [ ] Start a manual [Launchpad import](https://code.launchpad.net/~pajlada/chatterino/+git/chatterino) - scroll down & click Import Now +- [ ] Make a PPA release to [this repo](https://git.launchpad.net/~pajlada/+git/chatterino-packaging/) with the `debchange` command. + `debchange -v 2.4.0` then add the changelog entries + `debchange --release` then change the distro to be `unstable` diff --git a/resources/com.chatterino.chatterino.appdata.xml b/resources/com.chatterino.chatterino.appdata.xml index 33b7a362b..8a9af97d5 100644 --- a/resources/com.chatterino.chatterino.appdata.xml +++ b/resources/com.chatterino.chatterino.appdata.xml @@ -32,6 +32,9 @@ chatterino + + https://github.com/Chatterino/chatterino2/releases/tag/v2.4.5 + https://github.com/Chatterino/chatterino2/releases/tag/v2.4.4 diff --git a/src/common/Version.hpp b/src/common/Version.hpp index ab7764e1a..a9496fe6c 100644 --- a/src/common/Version.hpp +++ b/src/common/Version.hpp @@ -24,7 +24,7 @@ * - 2.4.0-alpha.2 * - 2.4.0-alpha **/ -#define CHATTERINO_VERSION "2.4.4" +#define CHATTERINO_VERSION "2.4.5" #if defined(Q_OS_WIN) # define CHATTERINO_OS "win"