From 8804be64365c2ad2630806fdd66c07ea6ea3e549 Mon Sep 17 00:00:00 2001 From: Gres Date: Wed, 4 Mar 2020 20:34:34 +0300 Subject: [PATCH] Force rescent compiler on linux --- .github/workflows/build.yml | 3 ++- share/ci/build.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69eacbf..7e9f02b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,8 @@ jobs: run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt install libgl1-mesa-dev libxkbcommon-x11-0 gcc-9 + sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 g++-9 + echo ::set-env name=QMAKE_FLAGS::QMAKE_CXX=g++-9 QMAKE_CC=gcc-9 - name: Get Qt run: python ./share/ci/get_qt.py diff --git a/share/ci/build.py b/share/ci/build.py index 3c9939f..e970c6a 100644 --- a/share/ci/build.py +++ b/share/ci/build.py @@ -19,6 +19,6 @@ c.run('lupdate "{}"'.format(pro_file)) c.run('lrelease "{}"'.format(pro_file)) c.set_make_threaded() -c.run('qmake "{}"'.format(pro_file)) +c.run('qmake {} "{}"'.format(os.environ.get('QMAKE_FLAGS',''), pro_file)) make_cmd = c.get_make_cmd() c.run(make_cmd)