From 505a58489f1b11ee877d0a2e967bdc2e43c323a1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 24 Sep 2021 13:39:43 +0300 Subject: [PATCH] Define compiler on linux. --- .cirrus.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index faf2b2771..c58d3f46d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -25,7 +25,7 @@ linux_task_template: &LINUX_TASK_TEMPLATE - cd build - pwd - qmake --version - - qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings + - qmake ../Valentina.pro -r -spec ${COMPILER} CONFIG+=noDebugSymbols CONFIG+=checkWarnings - "$CXX --version" - make -j$(nproc) - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$CIRRUS_WORKING_DIR/build/src/libs/vpropertyexplorer/bin:$CIRRUS_WORKING_DIR/build/src/libs/qmuparser/bin" @@ -60,7 +60,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE - pwd - qmake --version - QT_SELECT=qt5 qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests - - "$CXX --version" - make -j$(nproc) deploy_script: - ../scripts/cirrus-deploy.sh @@ -86,9 +85,13 @@ task: container: image: gcc:latest << : *LINUX_TASK_TEMPLATE + env: + COMPILER: linux-g++ task: name: 'latest Clang' container: image: silkeh/clang:latest << : *LINUX_TASK_TEMPLATE + env: + COMPILER: linux-clang