From 25a69fd10e8ada6015d8b937f6c82ce220c742e4 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 7 Apr 2024 12:03:14 +0200 Subject: [PATCH] Release v2.5.0-beta.1 (#5303) --- .CI/chatterino-installer.iss | 2 +- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- docs/make-release.md | 4 +++- resources/com.chatterino.chatterino.appdata.xml | 3 +++ src/common/Version.hpp | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.CI/chatterino-installer.iss b/.CI/chatterino-installer.iss index 2e3edbf52..fddd668f9 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.6" +#define MyAppVersion "2.5.0" #define MyAppPublisher "Chatterino Team" #define MyAppURL "https://www.chatterino.com" #define MyAppExeName "chatterino.exe" diff --git a/CHANGELOG.md b/CHANGELOG.md index 88793ee3b..e9ca57c90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unversioned +## 2.5.0-beta.1 + - Major: Twitch follower emotes can now be correctly tabbed in other channels when you are subscribed to the channel the emote is from. (#4922) - Major: Added `/automod` split to track automod caught messages across all open channels the user moderates. (#4986, #5026) - Major: Moderators can now see restricted chat messages and suspicious treatment updates. (#5056, #5060) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14efcb0da..3a08cf79e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ if(BUILD_BENCHMARKS) endif() project(chatterino - VERSION 2.4.6 + VERSION 2.5.0 DESCRIPTION "Chat client for twitch.tv" HOMEPAGE_URL "https://chatterino.com/" ) diff --git a/docs/make-release.md b/docs/make-release.md index c28dead6b..1509289fd 100644 --- a/docs/make-release.md +++ b/docs/make-release.md @@ -8,7 +8,9 @@ - [ ] Add a new release at the top 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` +- [ ] Updated version code in `.CI/chatterino-installer.iss` + 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` + - [ ] Update the changelog `## Unreleased` section to the new version `CHANGELOG.md` Make sure to leave the `## Unreleased` line unchanged for easier merges diff --git a/resources/com.chatterino.chatterino.appdata.xml b/resources/com.chatterino.chatterino.appdata.xml index ce9e25db8..5f76c9f6d 100644 --- a/resources/com.chatterino.chatterino.appdata.xml +++ b/resources/com.chatterino.chatterino.appdata.xml @@ -34,6 +34,9 @@ chatterino + + https://github.com/Chatterino/chatterino2/releases/tag/v2.5.0-beta.1 + https://github.com/Chatterino/chatterino2/releases/tag/v2.4.6 diff --git a/src/common/Version.hpp b/src/common/Version.hpp index 5d978b19a..3673e5b23 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.6" +#define CHATTERINO_VERSION "2.5.0-beta.1" #if defined(Q_OS_WIN) # define CHATTERINO_OS "win"