From 8aa15f4bbd8bd431790393efda15bcdf8b2f3c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 5 Nov 2020 09:40:13 +0000 Subject: [PATCH] Add a no-opengl build on Ubuntu 20.04 This reverts commit 9a8fb868ec2c526325408a4cbf3e628aa3377e30 partially. See also d494d76c26df48c9cf3b45fc15ebad963fe34c52. Task-number: QTQAINFRA-2577 Task-number: QTQAINFRA-3407 Change-Id: I6a01bea15002efe140c022a79e7f3f2f5a47c202 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index d2f5a6d7..99e619a3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -21,6 +21,14 @@ Configurations: Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'DisableTests'] + Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: [ + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC'