From 0e210958e6cab0c97d61941f5870e0795fa490da Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 6 Sep 2024 08:49:29 +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 Pick-to: 6.8 Change-Id: If5c615ccadcf1c5e6e2dac5efdff8c65938f5c25 Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/qtbase-new-compiler-testing.yaml | 2 +- coin/platform_configs/qtlite.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index bf4704ce739..3970d36a6c6 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-developer-build' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DoNotRunTests', 'StandaloneExamples'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples'] 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/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index 09e0d54a7d5..027aff074a2 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -17,7 +17,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-gcc14' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' Environment variables: [ 'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14', diff --git a/coin/platform_configs/qtlite.yaml b/coin/platform_configs/qtlite.yaml index 3cd2f8b3241..872d44ee55f 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