diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index c7094c144..e309fa09a 100755 --- a/.github/workflows/rssguard.yml +++ b/.github/workflows/rssguard.yml @@ -9,12 +9,12 @@ on: jobs: build-rssguard: - name: "rssguard; ${{ matrix.os }}; ${{ matrix.qmake_args }}" + name: "${{ matrix.os }}; webengine = ${{ matrix.use_webengine }}" runs-on: "${{ matrix.os }}" strategy: matrix: os: [windows-2019, ubuntu-16.04, macos-10.15] - qmake_args: ["USE_WEBENGINE=true"] + use_webengine: ["true", "false"] include: - os: windows-2019 script_name: .\resources\scripts\github-actions\build-windows.ps1 @@ -27,4 +27,4 @@ jobs: with: submodules: true - name: Prepare environment and compile application - run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.qmake_args }}" \ No newline at end of file + run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.use_webengine }}" \ 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 de6efee7b..82c488488 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -1,7 +1,7 @@ #!/bin/bash os="$1" -qmake_args="$2" +webengine="$2" if [[ "$os" == *"ubuntu"* ]]; then echo "We are building for GNU/Linux on Ubuntu." @@ -11,7 +11,7 @@ else is_linux=false fi -echo "OS: $os; qmake args: $qmake_args" +echo "OS: $os; WebEngine: $webengine" # Prepare environment. if [ $is_linux = true ]; then @@ -43,13 +43,13 @@ fi # Build application and package it. if [ $is_linux = true ]; then mkdir rssguard-build && cd rssguard-build - qmake .. "USE_WEBENGINE=$USE_WEBENGINE" + qmake .. "USE_WEBENGINE=$webengine" make make install cd "src/rssguard" else mkdir rssguard-build && cd rssguard-build - qmake .. "$qmake_args" + qmake .. "USE_WEBENGINE=$webengine" make make install cd "src/rssguard" diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 3f1adffb6..b262ba5f0 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -1,5 +1,5 @@ $os = $args[0] -$qmake_args = $args[1] +$webengine = $args[1] echo "We are building for MS Windows." -echo "OS: $os; qmake args: $qmake_args" \ No newline at end of file +echo "OS: $os; WebEngine: $webengine" \ No newline at end of file