pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save

Browse source
This commit is contained in:
Martin Rotter 2025-04-17 08:12:53 +02:00
parent 9d212c7063
commit 55e3f20f66
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/rssguard.yml vendored
View file

@ -33,19 +33,19 @@ jobs:
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
strategy: strategy:
matrix: matrix:
os: [windows-2022, ubuntu-20.04, macos-13] os: [windows-2022, ubuntu-24.04, macos-13]
no_lite: ["ON", "OFF"] no_lite: ["ON", "OFF"]
use_qt5: ["ON", "OFF"] use_qt5: ["ON", "OFF"]
include: include:
- os: windows-2022 - os: windows-2022
script_name: .\resources\scripts\github-actions\build-windows.ps1 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 script_name: ./resources/scripts/github-actions/build-linux-mac.sh
- os: macos-13 - os: macos-13
script_name: ./resources/scripts/github-actions/build-linux-mac.sh script_name: ./resources/scripts/github-actions/build-linux-mac.sh
exclude: exclude:
- os: ubuntu-20.04 - os: ubuntu-24.04
use_qt5: "OFF" use_qt5: "ON"
- os: macos-13 - os: macos-13
use_qt5: "ON" use_qt5: "ON"
steps: steps:
@ -77,7 +77,7 @@ jobs:
name: distribute-binaries name: distribute-binaries
needs: needs:
- build-rssguard - build-rssguard
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
permissions: permissions:
contents: write contents: write

20
resources/scripts/github-actions/build-linux-mac.sh
View file

@ -31,32 +31,22 @@ fi
echo "OS: $os; Not lite: $webengine" echo "OS: $os; Not lite: $webengine"
USE_QT6="ON"
# Install needed dependencies. # Install needed dependencies.
if [ $is_linux = true ]; then if [ $is_linux = true ]; then
# Qt 5. # 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 update
sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream sudo apt-get -qy install appstream cmake ninja-build openssl libssl-dev
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 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 else
# Qt 6. # Qt 6.
QTTARGET="mac" QTTARGET="mac"
QTOS="macos" QTOS="macos"
QTARCH="clang_64" QTARCH="clang_64"
USE_QT6="ON"
QTPATH="$(pwd)/Qt" QTPATH="$(pwd)/Qt"
QTVERSION="6.8.3" QTVERSION="6.8.3"