From e6aa16eb22153d5a03a2782004f6dde22691b439 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 8 Dec 2020 11:30:45 +0100 Subject: [PATCH] Actions --- .github/workflows/rssguard.yml | 2 +- .../scripts/github-actions/build-linux-mac.sh | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index 01b16d78d..c7094c144 100755 --- a/.github/workflows/rssguard.yml +++ b/.github/workflows/rssguard.yml @@ -9,7 +9,7 @@ on: jobs: build-rssguard: - name: "Build RSS Guard on ${{ matrix.os }} with ${{ matrix.qmake_args }}" + name: "rssguard; ${{ matrix.os }}; ${{ matrix.qmake_args }}" runs-on: "${{ matrix.os }}" strategy: matrix: diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh index f662458c0..de6efee7b 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -20,6 +20,8 @@ if [ $is_linux = true ]; then sudo apt-get update sudo apt-get -y install gcc-7 g++-7 qt515tools qt515base qt515webengine + + source /opt/qt515/bin/qt515-env.sh else pip3 install aqtinstall @@ -36,4 +38,41 @@ else export PATH="$QTBIN:$PATH" qmake --version +fi + +# Build application and package it. +if [ $is_linux = true ]; then + mkdir rssguard-build && cd rssguard-build + qmake .. "USE_WEBENGINE=$USE_WEBENGINE" + make + make install + cd "src/rssguard" +else + mkdir rssguard-build && cd rssguard-build + qmake .. "$qmake_args" + make + make install + cd "src/rssguard" + + # Fix .dylib linking. + install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "RSS Guard.app/Contents/MacOS/rssguard" + install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "rssguard" + + otool -L "RSS Guard.app/Contents/MacOS/rssguard" + macdeployqt "./RSS Guard.app" -dmg + + # Rename DMG. + set -- *.dmg + + dmgname="$1" + git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) + git_revision=$(git rev-parse --short HEAD) + + #if [ "$USE_WEBENGINE" = true ]; then + # dmgnewname="rssguard-${git_tag}-${git_revision}-mac64.dmg" + #else + # dmgnewname="rssguard-${git_tag}-${git_revision}-nowebengine-mac64.dmg" + #fi + + #mv "$dmgname" "$dmgnewname" fi \ No newline at end of file