From 960303afde3a1099d3b65a0b569a37ff663c4fd5 Mon Sep 17 00:00:00 2001 From: Andre Meyering Date: Sun, 22 Jan 2023 18:06:02 +0100 Subject: [PATCH] release: Prepare release of v2.10.0 --- .ci/README.md | 4 ++-- .ci/jenkins/CoverityScan.groovy | 4 ---- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .github/ISSUE_TEMPLATE/scraper-does-not-work.md | 4 ++-- CHANGELOG.md | 12 ++++-------- CMakeLists.txt | 2 +- MediaElch.plist | 6 +++--- Version.h | 6 +++--- debian/changelog | 6 ++++++ docs/admin/release.md | 6 +++--- obs/MediaElch.changes | 5 +++++ obs/README.md | 2 +- 12 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.ci/README.md b/.ci/README.md index 4644aa32a1..bd4820887e 100644 --- a/.ci/README.md +++ b/.ci/README.md @@ -26,9 +26,9 @@ rm -rf build ./.ci/linux/package_linux_appimage_in_docker.sh # win -./.ci/win/build_windows_release_release_qt6_in_docker.sh +./.ci/win/build_windows_release_qt6_in_docker.sh ./.ci/win/package_windows_qt6_in_docker.sh -./.ci/win/build_windows_release_release_qt5_in_docker.sh +./.ci/win/build_windows_release_qt5_in_docker.sh ./.ci/win/package_windows_qt5_in_docker.sh # Gather Packages diff --git a/.ci/jenkins/CoverityScan.groovy b/.ci/jenkins/CoverityScan.groovy index 866dc36aee..4c39677598 100644 --- a/.ci/jenkins/CoverityScan.groovy +++ b/.ci/jenkins/CoverityScan.groovy @@ -63,10 +63,6 @@ pipeline { export PATH="$(pwd)/${COVERITY_DIR}/bin/:${PATH}" - pwd - ls -la - - ls -la "${COVERITY_DIR}" cd MediaElch git submodule update --init diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e485c7b382..5a11b70be5 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,8 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **MediaElch Version:** - - [ ] 2.8.19-dev (nightly) - - [ ] 2.8.18 stable + - [ ] 2.10.1-dev (nightly) + - [ ] 2.10.0 stable **Operating System:** diff --git a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md index 67036c70f7..961b68e8ad 100644 --- a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md +++ b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md @@ -22,8 +22,8 @@ assignees: '' Add a list of information that is not loaded correctly. **MediaElch Version:** - - [ ] 2.8.19-dev (nightly) - - [ ] 2.8.18 stable + - [ ] 2.10.1-dev (nightly) + - [ ] 2.10.0 stable **Operating System:** - [ ] Windows diff --git a/CHANGELOG.md b/CHANGELOG.md index fb7589adbe..34ad6214aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog -## 2.8.19 - *tbd* +## 2.10.0 - Benzar (2023-01-22) ### Notes - There are now different MediaElch releases for Windows 7/8 and Windows 10/11. - The Windows 10 or later releases use Qt6, which fix scaling issuse on 4k display + The Windows 10 or later releases use Qt6, which fix scaling issues on 4k display with scaling >100% (#429) ### Bugfixes @@ -46,14 +46,10 @@ ### Added - - Dark Mode: MediaElch has gained an experimental dark mode for its _main window_ (#761). + - Dark Mode: MediaElch has gained an experimental dark mode for its *main window* (#761). It can only be set through MediaElch's settings. On macOS, the theme is automatically detected if set to "auto". - - The TV show search dialog has gained a preview - -### Removed - - - *tbd* + - The TV show search dialog has gained a preview (#1513) ### Internal Improvements and Changes diff --git a/CMakeLists.txt b/CMakeLists.txt index bfb02cb424..25b1da88a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR) project( mediaelch - VERSION 2.8.19 + VERSION 2.10.0 DESCRIPTION "Media Manager for Kodi" HOMEPAGE_URL "https://mediaelch.github.io/" ) diff --git a/MediaElch.plist b/MediaElch.plist index f956f841d7..df98409f76 100644 --- a/MediaElch.plist +++ b/MediaElch.plist @@ -7,11 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.8.19 + 2.10.0 CFBundleVersion - 2.8.19 + 2.10.0 CFBundleShortVersionString - 2.8.19 + 2.10.0 CFBundleExecutable MediaElch CFBundleHelpBookFolder diff --git a/Version.h b/Version.h index 4666ab1b02..edf30a6857 100644 --- a/Version.h +++ b/Version.h @@ -9,9 +9,9 @@ namespace mediaelch { namespace constants { constexpr char AppName[] = "MediaElch"; -constexpr char AppVersionStr[] = "2.8.19"; // major.minor.patch -constexpr char AppVersionFullStr[] = "2.8.19-dev"; // major.minor.patch-identifier -constexpr char VersionName[] = "Coridian"; +constexpr char AppVersionStr[] = "2.10.0"; // major.minor.patch +constexpr char AppVersionFullStr[] = "2.10.0"; // major.minor.patch-identifier +constexpr char VersionName[] = "Benzar"; constexpr char OrganizationName[] = "kvibes"; #ifdef QT_NO_DEBUG diff --git a/debian/changelog b/debian/changelog index a51d6bf26c..a5d016497b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediaelch (2.10.0-1) bionic; urgency=medium + + * next release + + -- Andre Meyering Sun, 22 Jan 2023 12:30:00 +0100 + mediaelch (2.8.18-1) bionic; urgency=medium * next release diff --git a/docs/admin/release.md b/docs/admin/release.md index 0270db1133..0103bf5f42 100644 --- a/docs/admin/release.md +++ b/docs/admin/release.md @@ -48,9 +48,9 @@ But better check all commit messages since the last version tag: ```sh # Print all commits between the git tag v2.8.18 and the current master branch -git log --oneline v2.8.18..master +git log --oneline v2.10.0..master # Count the number of commits since the last version -git log --oneline v2.8.18..master | wc -l +git log --oneline v2.10.0..master | wc -l ``` @@ -88,7 +88,7 @@ add a Git tag (see next section), it includes the latest documentation state. 1. Commit your changes (MediaElch version and changelogs). 2. Add a version tag and push your changes - - `git tag -a v2.8.18 -m "MediaElch Version 2.8.17"` + - `git tag -a v2.10.0 -m "MediaElch Version 2.10.0"` - `git push origin master` (or better: Create a pull request) - `git push --tags` - `git checkout release && git merge master && git push origin release` diff --git a/obs/MediaElch.changes b/obs/MediaElch.changes index 53e871b485..4d86f9aed2 100644 --- a/obs/MediaElch.changes +++ b/obs/MediaElch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 22 12:30:00 UTC 2023 - Andre Meyering + +- Update to MediaElch v2.10.0 + ------------------------------------------------------------------- Fri Oct 28 12:30:00 UTC 2022 - Andre Meyering diff --git a/obs/README.md b/obs/README.md index 2031dd8008..7eeb0cf01f 100644 --- a/obs/README.md +++ b/obs/README.md @@ -72,7 +72,7 @@ osc commit ```sh rm MediaElch-*.tar.gz -export ME_VERSION=2.8.18 +export ME_VERSION=2.10.0 # Clone latest version. Shallow clone is enough. git clone --depth=1 --recursive https://github.com/Komet/MediaElch.git # Exclude .git, documentation and build folder.