From f46957f843277d83ffea2171a404bef5c82718a2 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 29 Apr 2025 07:46:20 +0200 Subject: [PATCH] disable stupid appimagetool deployment completely, now, the flatpak will be official for linux or compile. --- .github/workflows/rssguard.yml | 2 - docs/source/contrib/compile.md | 4 ++ .../scripts/github-actions/build-linux-mac.sh | 43 ++++++++----------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index cd18f632f..d4edd4bcf 100755 --- a/.github/workflows/rssguard.yml +++ b/.github/workflows/rssguard.yml @@ -46,8 +46,6 @@ jobs: exclude: - os: ubuntu-24.04 use_qt5: "ON" - - os: ubuntu-24.04 - no_lite: "ON" - os: macos-13 use_qt5: "ON" steps: diff --git a/docs/source/contrib/compile.md b/docs/source/contrib/compile.md index 0b10ebec7..8ffb406c6 100644 --- a/docs/source/contrib/compile.md +++ b/docs/source/contrib/compile.md @@ -20,3 +20,7 @@ cmake --build build-dir -j$(nproc) # (Optional) Install RSS Guard system-wide sudo make -C build-dir install ``` + +```{warning} +Note that on Mac OS X, in some cases, you have to self-sign the application via `codesign` utility to make the application run. +``` \ No newline at end of file diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index aa55acf0a..4594580f0 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -86,27 +86,22 @@ if [ $is_linux = true ]; then echo 'Validating AppStream metadata...' appstreamcli validate "$prefix/share/metainfo/$app_id.metainfo.xml" - # Obtain appimagetool. - appimagetool_file=$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) - - wget -c "https://github.com/$appimagetool_file" - chmod +x appimagetool-*.AppImage - mv appimagetool-*.AppImage appimagetool.AppImage - - export VERSION=1.0 - - ./appimagetool.AppImage -s deploy AppDir/usr/share/applications/*.desktop - ./appimagetool.AppImage ./AppDir - - # Rename AppImaage. - set -- R*.AppImage - imagename="$1" - - if [[ "$webengine" == "ON" ]]; then - imagenewname="rssguard-${git_tag}-${git_revision}-linux64.AppImage" - else - imagenewname="rssguard-${git_tag}-${git_revision}-lite-linux64.AppImage" - fi + ## Obtain appimagetool. + #appimagetool_file=$(wget -q https://github.com/probonopd/go-appimage/releases/expanded_assets/continuous -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) + #wget -c "https://github.com/$appimagetool_file" + #chmod +x appimagetool-*.AppImage + #mv appimagetool-*.AppImage appimagetool.AppImage + #export VERSION=1.0 + #./appimagetool.AppImage -s deploy AppDir/usr/share/applications/*.desktop + #./appimagetool.AppImage ./AppDir + ## Rename AppImaage. + #set -- R*.AppImage + #imagename="$1" + #if [[ "$webengine" == "ON" ]]; then + # imagenewname="rssguard-${git_tag}-${git_revision}-linux64.AppImage" + #else + # imagenewname="rssguard-${git_tag}-${git_revision}-lite-linux64.AppImage" + #fi else # Fix .dylib linking. otool -L "$prefix/Contents/MacOS/rssguard" @@ -131,7 +126,7 @@ else else imagenewname="rssguard-${git_tag}-${git_revision}-lite-mac64.dmg" fi -fi -mv "$imagename" "$imagenewname" -ls + mv "$imagename" "$imagenewname" + ls +fi \ No newline at end of file