Skip to content

Commit

Permalink
Linux: AppStream metadata validation and minor changes (#1132)
Browse files Browse the repository at this point in the history
* metainfo: add caption to the main screenshot

* metainfo: add link to documentation

* metainfo: add link to release notes

* ci: validate Linux AppStream metadata
  • Loading branch information
guihkx authored Oct 13, 2023
1 parent 12d17e6 commit 4e7bf94
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
11 changes: 7 additions & 4 deletions resources/desktop/rssguard.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@
<launchable type="desktop-id">@[email protected]</launchable>
<screenshots>
<screenshot type="default">
<image>
https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/graphics/official_pictures/main-window-linux.png</image>
<caption>The main window</caption>
<image>https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/graphics/official_pictures/main-window-linux.png</image>
</screenshot>
</screenshots>
<url type="homepage">https://github.com/martinrotter/rssguard</url>
<url type="help">https://rssguard.readthedocs.io</url>
<url type="bugtracker">https://github.com/martinrotter/rssguard/issues</url>
<url type="donation">https://github.com/sponsors/martinrotter</url>
<url type="translate">https://crowdin.com/project/rssguard</url>
Expand All @@ -67,9 +68,11 @@
<content_rating type="oars-1.0" />
<content_rating type="oars-1.1" />
<releases>
<release version="@APP_VERSION@" date="@DATE@" />
<release version="@APP_VERSION@" date="@DATE@">
<url>https://github.com/martinrotter/rssguard/releases/tag/@APP_VERSION@</url>
</release>
</releases>
<provides>
<binary>@APP_LOW_NAME@</binary>
</provides>
</component>
</component>
7 changes: 5 additions & 2 deletions resources/scripts/github-actions/build-linux-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ $is_linux = true ]; then
sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
sudo apt-get update

sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats
sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream-util
sudo apt-get -qy install cmake ninja-build openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-nice gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-qt5 gstreamer1.0-pulseaudio

# The script below performs some broken testing, which ends up tripping 'set -e'.
Expand Down Expand Up @@ -83,6 +83,9 @@ cmake --build .
cmake --install . --prefix "$prefix"

if [ $is_linux = true ]; then
# Validate AppStream metadata.
echo 'Validating AppStream metadata...'
appstream-util validate-relax "$prefix/share/metainfo/$app_id.metainfo.xml"
# Obtain linuxdeployqt.
wget -qc https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
Expand Down Expand Up @@ -146,4 +149,4 @@ else
fi

mv "$imagename" "$imagenewname"
ls
ls

0 comments on commit 4e7bf94

Please sign in to comment.