Skip to content

Commit

Permalink
release: Release MediaElch v2.10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
bugwelle committed Dec 3, 2023
1 parent 322cb4e commit 6121419
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.5-dev (nightly)
- [ ] 2.10.4 (stable)
- [ ] 2.10.7-dev (nightly)
- [ ] 2.10.6 (stable)
<!-- older stable versions are not supported; please update -->

**Operating System:**
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/scraper-does-not-work.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ assignees: ''
Add a list of information that is not loaded correctly.

**MediaElch Version:**
- [ ] 2.10.5-dev (nightly)
- [ ] 2.10.4 (stable)
- [ ] 2.10.7-dev (nightly)
- [ ] 2.10.6 (stable)

**Operating System:**
- [ ] Windows
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Changelog


## Upcoming
## 2.10.6 - 2023-12-03

### Notes

- MediaElch for macOS 11 and later now uses Qt 6.6.0
- MediaElch for macOS 11 and later now uses Qt 6.6.1

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)

project(
mediaelch
VERSION 2.10.5
VERSION 2.10.6
DESCRIPTION "Media Manager for Kodi"
HOMEPAGE_URL "https://mediaelch.github.io/"
)
Expand Down
6 changes: 3 additions & 3 deletions MediaElch.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>2.10.5</string>
<string>2.10.6</string>
<key>CFBundleVersion</key>
<string>2.10.5</string>
<string>2.10.6</string>
<key>CFBundleShortVersionString</key>
<string>2.10.5</string>
<string>2.10.6</string>
<key>CFBundleExecutable</key>
<string>MediaElch</string>
<key>CFBundleHelpBookFolder</key>
Expand Down
4 changes: 2 additions & 2 deletions Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ namespace constants {

// Update versions via ./scripts/release/bump_version.py
constexpr char AppName[] = "MediaElch";
constexpr char AppVersionStr[] = "2.10.5"; // major.minor.patch
constexpr char AppVersionFullStr[] = "2.10.5-dev"; // major.minor.patch[-identifier]
constexpr char AppVersionStr[] = "2.10.6"; // major.minor.patch
constexpr char AppVersionFullStr[] = "2.10.6"; // major.minor.patch[-identifier]
constexpr char VersionName[] = "Benzar";
constexpr char OrganizationName[] = "kvibes";

Expand Down
6 changes: 3 additions & 3 deletions docs/admin/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ But better check all commit messages since the last version tag:

```sh
# Print all commits between a git tag and the current master branch
git log --oneline v2.10.5..master
git log --oneline v2.10.6..master
# Count the number of commits since the last version
git log --oneline v2.10.5..master | wc -l
git log --oneline v2.10.6..master | wc -l
```


Expand Down Expand Up @@ -89,7 +89,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.10.5 -m "MediaElch Version 2.10.5"`
- `git tag -a v2.10.6 -m "MediaElch Version 2.10.6"`
- `git push origin master` (or better: Create a pull request)
- `git push --tags`
- `git checkout release && git merge master && git push origin release`
Expand Down
2 changes: 1 addition & 1 deletion obs/MediaElch.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

Name: MediaElch
Version: 2.10.5
Version: 2.10.6
Release: 1%{?dist}
License: LGPL-3.0-only
Summary: A Media Manager for Kodi
Expand Down
2 changes: 1 addition & 1 deletion obs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ osc commit
```sh
rm MediaElch-*.tar.gz

export ME_VERSION=2.10.5
export ME_VERSION=2.10.6
# Clone latest version. Shallow clone is enough.
git clone --depth=1 --branch release --single-branch --recursive https://github.com/Komet/MediaElch.git
# Exclude .git, documentation and build folder.
Expand Down
3 changes: 2 additions & 1 deletion scripts/release/bump_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ def update_changelog(version):
else:
print(f" git commit -m 'release: Release MediaElch v{new_version_name.short}'")

print(""" git push -u origin prepare-release
print(""" git checkout -b prepare-release
git push -u origin prepare-release
""")

if not new_version_name.is_dev:
Expand Down

0 comments on commit 6121419

Please sign in to comment.