From 55e3f20f66dfbeac429e0f2e78748383b50f439f Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Thu, 17 Apr 2025 08:12:53 +0200
Subject: [PATCH] save

---
 .github/workflows/rssguard.yml                | 10 +++++-----
 .../scripts/github-actions/build-linux-mac.sh | 20 +++++--------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml
index 31a41b2e9..d4edd4bcf 100755
--- a/.github/workflows/rssguard.yml
+++ b/.github/workflows/rssguard.yml
@@ -33,19 +33,19 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        os: [windows-2022, ubuntu-20.04, macos-13]
+        os: [windows-2022, ubuntu-24.04, macos-13]
         no_lite: ["ON", "OFF"]
         use_qt5: ["ON", "OFF"]
         include:
           - os: windows-2022
             script_name: .\resources\scripts\github-actions\build-windows.ps1
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             script_name: ./resources/scripts/github-actions/build-linux-mac.sh
           - os: macos-13
             script_name: ./resources/scripts/github-actions/build-linux-mac.sh
         exclude:
-          - os: ubuntu-20.04
-            use_qt5: "OFF"
+          - os: ubuntu-24.04
+            use_qt5: "ON"
           - os: macos-13
             use_qt5: "ON"
     steps:         
@@ -77,7 +77,7 @@ jobs:
     name: distribute-binaries
     needs:
       - build-rssguard
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
 
diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh
index 1561c48c3..28bb717a4 100755
--- a/resources/scripts/github-actions/build-linux-mac.sh
+++ b/resources/scripts/github-actions/build-linux-mac.sh
@@ -31,32 +31,22 @@ fi
 
 echo "OS: $os; Not lite: $webengine"
 
+USE_QT6="ON"
+
 # Install needed dependencies.
 if [ $is_linux = true ]; then
   # Qt 5.
-  QTTARGET="linux"
-  QTOS="gcc_64"
-  QTARCH="gcc_64"
-  USE_QT6="OFF"
-
-  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
-  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
+  sudo apt-get -qy install appstream cmake ninja-build openssl libssl-dev 
+  sudo apt-get -qy install qt6-5compat-dev qt6-base-dev-tools
 
-  # The script below performs some broken testing, which ends up tripping 'set -e'.
-  # So we temporarily ignore errors when sourcing the script, and re-enable them afterward.
-  set +e
-  # shellcheck source=/dev/null
-  source /opt/qt515/bin/qt515-env.sh
-  set -e
+  
 else
   # Qt 6.
   QTTARGET="mac"
   QTOS="macos"
   QTARCH="clang_64"
-  USE_QT6="ON"
 
   QTPATH="$(pwd)/Qt"
   QTVERSION="6.8.3"