Merge branch 'master' of github.com:martinrotter/rssguard

This commit is contained in:
Martin Rotter 2024-02-27 07:17:13 +01:00
commit bca1432020
4 changed files with 11 additions and 10 deletions

View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check script syntax
run: bash -n ./resources/scripts/github-actions/build-linux-mac.sh
@ -46,7 +46,7 @@ jobs:
use_qt5: "ON"
steps:
- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
@ -60,7 +60,7 @@ jobs:
FEEDLY_CLIENT_SECRET: ${{ secrets.FEEDLY_CLIENT_SECRET }}
- name: Upload binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: RSS_Guard-${{ runner.os }}${{ matrix.no_lite == 'ON' && '-' || '-nowebengine-' }}Qt${{ matrix.use_qt5 == 'ON' && '5' || '6' }}
@ -80,7 +80,7 @@ jobs:
steps:
- name: Download binaries from previous jobs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts

View File

@ -5,7 +5,7 @@ Sometimes you need to automatically tweak the incoming article - mark it starred
## `Article filters` dialog
The dialog seen below offers you a way of managing your article filters. You can assign single filter to multiple feeds.
`Test` button tests selected filter against existing messages. `Process checked feeds` runs the filter against messages from checked feeds.
`Test` button tests selected filter against existing messages. `Process checked feeds` runs the filter against existing messages from checked feeds - in this mode all modifications made by the filter are saved to existing messages.
<img alt="alt-img" src="images/filters-dialog.png" width="600px">
@ -296,4 +296,4 @@ function filterMessage() {
return MessageObject.Accept;
}
```
```

View File

@ -5,7 +5,9 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0</project_license>
<name>@APPDATA_NAME@</name>
<developer_name>Martin Rotter</developer_name>
<developer id="io.github.martinrotter">
<name>Martin Rotter</name>
</developer>
<update_contact>rotter.martinos_AT_gmail.com</update_contact>
<summary>@APPDATA_SUMMARY@</summary>
<description>
@ -65,7 +67,6 @@
<keyword translate="no">The Old Reader</keyword>
<keyword translate="no">Tiny Tiny RSS</keyword>
</keywords>
<content_rating type="oars-1.0" />
<content_rating type="oars-1.1" />
<releases>
<release version="@APP_VERSION@" date="@DATE@">

View File

@ -42,7 +42,7 @@ if [ $is_linux = true ]; then
sudo add-apt-repository ppa:beineri/opt-qt-5.15.4-focal -y
sudo apt-get update
sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream-util
sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream
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 libmpv-dev
# The script below performs some broken testing, which ends up tripping 'set -e'.
@ -93,7 +93,7 @@ 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"
appstreamcli validate "$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