From 39facc0a9540d59afbb1bf5d7871fa1170b38a4b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 12 Sep 2024 06:46:44 +0200 Subject: [PATCH] Ubuntu 24.04 arm64: enable the usage of sccache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If5c615ccadcf1c5e6e2dac5efdff8c65938f5c25 Reviewed-by: Simo Fält (cherry picked from commit 0e210958e6cab0c97d61941f5870e0795fa490da) Reviewed-by: Liang Qi --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/qtlite.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 61a2fa24..48b16ce8 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -43,7 +43,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-documentation' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', @@ -53,7 +53,7 @@ Configurations: Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', diff --git a/coin/platform_configs/qtlite.yaml b/coin/platform_configs/qtlite.yaml index 3cd2f8b3..872d44ee 100644 --- a/coin/platform_configs/qtlite.yaml +++ b/coin/platform_configs/qtlite.yaml @@ -4,7 +4,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-static-qtlite' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] Configure arguments: > -nomake examples -release