diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml index b0d9521c2..01b16d78d 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 }}" + name: "Build RSS Guard on ${{ matrix.os }} with ${{ matrix.qmake_args }}" runs-on: "${{ matrix.os }}" strategy: matrix: @@ -24,5 +24,7 @@ jobs: script_name: ./resources/scripts/github-actions/build-linux-mac.sh steps: - uses: actions/checkout@v2 - - name: Compile app + with: + submodules: true + - name: Prepare environment and compile application run: ${{ matrix.script_name }} "${{ matrix.os }}" "${{ matrix.qmake_args }}" \ 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 428da3d58..670427264 100755 --- a/resources/scripts/github-actions/build-linux-mac.sh +++ b/resources/scripts/github-actions/build-linux-mac.sh @@ -11,4 +11,15 @@ else is_linux=false fi -echo "OS: $os; qmake args: $qmake_args" \ No newline at end of file +echo "OS: $os; qmake args: $qmake_args" + +# Prepare environment. +if [ $is_linux = true ]; then + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y + + sudo apt-get update + sudo apt-get -y install gcc-7 g++-7 qt515tools qt515base qt515webengine +else + pip3 install aqtinstall +fi \ No newline at end of file