diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index c828c331f..dfe5756ee 100755 --- a/.github/workflows/rssguard.yml +++ b/.github/workflows/rssguard.yml @@ -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 diff --git a/docs/source/features/filters.md b/docs/source/features/filters.md index 7cc0a04db..e150afa06 100644 --- a/docs/source/features/filters.md +++ b/docs/source/features/filters.md @@ -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. alt-img @@ -296,4 +296,4 @@ function filterMessage() { return MessageObject.Accept; } -``` \ No newline at end of file +``` diff --git a/resources/desktop/rssguard.metainfo.xml.in b/resources/desktop/rssguard.metainfo.xml.in index cfc23d281..60e44cf05 100644 --- a/resources/desktop/rssguard.metainfo.xml.in +++ b/resources/desktop/rssguard.metainfo.xml.in @@ -5,7 +5,9 @@ CC0-1.0 GPL-3.0 @APPDATA_NAME@ - Martin Rotter + + Martin Rotter + rotter.martinos_AT_gmail.com @APPDATA_SUMMARY@ @@ -65,7 +67,6 @@ The Old Reader Tiny Tiny RSS - diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index f790ba98f..081e4e57d 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -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