From 84e18bb200da6c1aa53c71fb2fc365843c58b9e2 Mon Sep 17 00:00:00 2001 From: Andre Meyering Date: Sun, 6 Feb 2022 13:35:22 +0100 Subject: [PATCH] [Release] Prepare release of v2.8.14 --- .github/ISSUE_TEMPLATE/bug_report.md | 4 +-- .../ISSUE_TEMPLATE/scraper-does-not-work.md | 4 +-- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- MediaElch.plist | 6 ++--- Version.h | 4 +-- debian/changelog | 6 +++++ docs/admin/coverity.md | 19 +++++++++++--- docs/admin/release.md | 16 ++++++------ obs/MediaElch.changes | 25 +++++++++++++++++++ obs/MediaElch.spec | 2 +- obs/README.md | 10 +++++--- 12 files changed, 74 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9a6b189db4..29f9e9a743 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.13-dev (nightly) - - [ ] 2.8.12 stable + - [ ] 2.8.15-dev (nightly) + - [ ] 2.8.14 stable **Operating System:** diff --git a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md index aec1f6df33..412e4924c7 100644 --- a/.github/ISSUE_TEMPLATE/scraper-does-not-work.md +++ b/.github/ISSUE_TEMPLATE/scraper-does-not-work.md @@ -24,8 +24,8 @@ assignees: '' Add a list of information that is not loaded correctly. **MediaElch Version:** - - [ ] 2.8.13-dev (nightly) - - [ ] 2.8.12 stable + - [ ] 2.8.15-dev (nightly) + - [ ] 2.8.14 stable **Operating System:** - [ ] Windows diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fe626e348..8ba72f6eb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.8.13 - *tbd* +## 2.8.14 - Coridian (2022-02-06) ### Notes diff --git a/CMakeLists.txt b/CMakeLists.txt index 6960283f0b..f4ba716511 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.13 + VERSION 2.8.14 DESCRIPTION "Media Manager for Kodi" HOMEPAGE_URL "https://mediaelch.github.io/" ) diff --git a/MediaElch.plist b/MediaElch.plist index 52861129ca..65c16620e7 100644 --- a/MediaElch.plist +++ b/MediaElch.plist @@ -7,11 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.8.13 + 2.8.14 CFBundleVersion - 2.8.13 + 2.8.14 CFBundleShortVersionString - 2.8.13 + 2.8.14 CFBundleExecutable MediaElch CFBundleHelpBookFolder diff --git a/Version.h b/Version.h index c8d027d4a6..4fbb09f12a 100644 --- a/Version.h +++ b/Version.h @@ -9,8 +9,8 @@ namespace mediaelch { namespace constants { constexpr char AppName[] = "MediaElch"; -constexpr char AppVersionStr[] = "2.8.13"; // major.minor.patch -constexpr char AppVersionFullStr[] = "2.8.13-dev"; // major.minor.patch-identifier +constexpr char AppVersionStr[] = "2.8.14"; // major.minor.patch +constexpr char AppVersionFullStr[] = "2.8.14"; // major.minor.patch-identifier constexpr char VersionName[] = "Coridian"; constexpr char OrganizationName[] = "kvibes"; diff --git a/debian/changelog b/debian/changelog index f27907eba6..8546619e4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mediaelch (2.8.14-1) xenial; urgency=medium + + * next release + + -- Andre Meyering Sun, 06 Feb 2022 13:46:14 +0100 + mediaelch (2.8.8.2-1~bionic) bionic; urgency=medium * next build diff --git a/docs/admin/coverity.md b/docs/admin/coverity.md index 59e95bacd4..cba0ec6325 100644 --- a/docs/admin/coverity.md +++ b/docs/admin/coverity.md @@ -22,12 +22,12 @@ The next steps are shown in following bash script. You need to add Coverity's `bin` directory to your `$PATH`. ```sh -export PATH="/path/to/coverity-analysis/bin/:$PATH" +export PATH="/path/to/cov-analysis-linux64-2020.09/bin/:$PATH" git clone https://github.com/Komet/MediaElch.git cd MediaElch mkdir build && cd build cmake .. -DUSE_EXTERN_QUAZIP=ON -cov-build --dir cov-int make -j 4 +cov-build --dir cov-int make -j 8 if grep "compilation units (100%) successfully" cov-int/build-log.txt; then tar caf myproject.xz cov-int fi @@ -39,7 +39,20 @@ fine. Check that the Coverity build was successful and if it was then upload the generated `myproject.xz` file to [Coverity][newcoverity]. Note that the -generated `.xz` file is multiple hundrets of megabytes large. +generated `.xz` file is multiple hundreds of megabytes large. + +### Troubleshooting +It can happen that Coverity fails with e.g. only 3% of successful compilation +units. The reason is unknown to me but I think it may have to do with custom +(more modern) GCC versions that I've installed locally that use more modern +standard library headers. If it fails, try to build inside a docker container: + +```sh +docker run -it -v "$(pwd):/opt" ubuntu:latest /bin/bash +``` + +You will need to install all of MediaElch's dependencies and then follow the +steps of the previous section. ## How often should a new build be uploaded to Coverity? diff --git a/docs/admin/release.md b/docs/admin/release.md index 7ebfdee909..4fdda974ad 100644 --- a/docs/admin/release.md +++ b/docs/admin/release.md @@ -37,9 +37,9 @@ file was missed. In the latter case, update the list above. ## Update Changelogs - 1. [main changelog](#user-content-notes--main-changelog) (`changelog.md`) - 2. [debian changelog](#user-content-notes--debian-changelog) (use `dch -v "${ME_VERSION}-1" -D xenial -M`) - 3. [obs changelog](#user-content-notes--obs-changelog) (`obs/MediaElch.changes`) + 1. [main changelog](#main-changelog) (`changelog.md`) + 2. [debian changelog](#debian-changelog) (use `dch -v "${ME_VERSION}-1" -D xenial -M`) + 3. [obs changelog](#obs-changelog) (`obs/MediaElch.changes`) ### Main Changelog The main changelog should already contain all relevant changes because @@ -47,10 +47,10 @@ they should have been added right with the corresponding commits. But better check all commit messages since the last version tag: ```sh -# Print all commits between the git tag v2.8.13 and the current master branch -git log --oneline v2.8.13..master +# Print all commits between the git tag v2.8.14 and the current master branch +git log --oneline v2.8.14..master # Count the number of commits since the last version -git log --oneline v2.8.13..master | wc -l +git log --oneline v2.8.14..master | wc -l ``` @@ -87,7 +87,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.13 -m "MediaElch Version 2.8.13"` + - `git tag -a v2.8.14 -m "MediaElch Version 2.8.14"` - `git push origin master` - `git push --tags` @@ -159,7 +159,7 @@ Your GPG key may be outdated. Please see: + +- Update to MediaElch v2.8.14 + +------------------------------------------------------------------- +Mon May 10 07:01:43 UTC 2021 - Andre Meyering + +- Update to MediaElch v2.8.12 + +------------------------------------------------------------------- +Mon May 3 18:26:18 UTC 2021 - Andre Meyering + +- Update to MediaElch v2.8.10 + +------------------------------------------------------------------- +Mon Apr 26 16:21:21 UTC 2021 - Andre Meyering + +- Fix spec file + +------------------------------------------------------------------- +Mon Apr 26 15:36:48 UTC 2021 - Andre Meyering + +- Update to MediaElch v2.8.8 + ------------------------------------------------------------------- Fri Jan 22 12:40:07 UTC 2021 - Andre Meyering diff --git a/obs/MediaElch.spec b/obs/MediaElch.spec index 20b9eaffea..531089c073 100644 --- a/obs/MediaElch.spec +++ b/obs/MediaElch.spec @@ -3,7 +3,7 @@ # Name: MediaElch -Version: 2.8.13 +Version: 2.8.14 Release: 1%{?dist} License: LGPL-3.0-only Summary: A Media Manager for Kodi diff --git a/obs/README.md b/obs/README.md index b787ff427e..5e69668aba 100644 --- a/obs/README.md +++ b/obs/README.md @@ -34,7 +34,9 @@ cp /path/to/MediaElch/obs/MediaElch.* . # Package MediaElch into MediaElch-${ME_VERSION}.tar.gz # See "Compress MediaElch" for an example. -# Update MediaElch.changes => copy changelog.md +# Update MediaElch.changes +# => Add entry "Update to MediaElch v2.X.Y" +# => Copy changelog to MediaElch repository osc vc osc add *.spec *.changes *.tar.gz osc commit @@ -53,7 +55,9 @@ cd home:bugwelle/MediaElch # Delete the old .tar.gz # Update MediaElch.spec -# Update MediaElch.changes => copy changelog.md +# Update MediaElch.changes +# => Add entry "Update to MediaElch v2.X.Y" +# => Copy changelog to MediaElch repository osc vc osc addremove *.spec *.changes *.tar.gz @@ -65,7 +69,7 @@ osc commit ```sh rm MediaElch-*.tar.gz -export ME_VERSION=2.8.13 +export ME_VERSION=2.8.14 # Clone latest version. git clone https://github.com/Komet/MediaElch.git MediaElch cd MediaElch