From cc79b9ec5d94eecf8695e0aa711d792934b67929 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 23 Aug 2024 14:12:31 +0200 Subject: [PATCH] CMake: Generate SBOM for more platforms tagged with Packaging Amends 3017e86d5459b9d158c3151fc358630142731ac8 Amends 562b56c8d78c4e31410966fad25a1d10f481a75f Task-number: QTBUG-122899 Task-number: QTBUG-127335 Change-Id: Ibad8957c4bc90d26f9f2f3ffe543ca243f72eb9b Reviewed-by: Alexey Edelev (cherry picked from commit 2cf756950465c88564dccba540afec2f087f5435) Reviewed-by: Alexey Edelev --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 440c9624..61a2fa24 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -53,7 +53,7 @@ Configurations: Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'DoNotRunTests'] + Features: ['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', @@ -204,7 +204,7 @@ Configurations: Id: 'debian-11.6-arm64' Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] + Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',