From 3017e86d5459b9d158c3151fc358630142731ac8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 21 May 2024 13:27:44 +0200 Subject: [PATCH] coin: Mark platforms that should generate an SBOM Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: I3722c048ec4be894a09d3b023d6af95d4dfedc6f Reviewed-by: Joerg Bornemann --- coin/platform_configs/cmake_platforms.yaml | 20 +++++++++---------- .../cmake_platforms_qemu.yaml | 2 +- .../cmake_platforms_qemu_qnx710.yaml | 6 +++--- .../cmake_platforms_target_android.yaml | 8 ++++---- .../cmake_platforms_wasm.yaml | 4 ++-- coin/platform_configs/macos.yaml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 80c0e452..15622dfc 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -19,7 +19,7 @@ Configurations: Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM'] 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' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', @@ -124,7 +124,7 @@ Configurations: Id: 'sles-15_sp5-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-nomake examples -static -no-sql-mysql' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -134,7 +134,7 @@ Configurations: Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -146,7 +146,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', @@ -158,7 +158,7 @@ Configurations: Id: 'windows-11_22h2-arm64-msvc2022' Template: 'qtci-windows-11_22H2-aarch64-52' Compiler: 'MSVC2022' - Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', @@ -169,7 +169,7 @@ Configurations: Id: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -179,7 +179,7 @@ Configurations: Id: 'rhel-9.2' Template: 'qtci-linux-RHEL-9.2-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', @@ -215,7 +215,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -224,7 +224,7 @@ Configurations: Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -237,7 +237,7 @@ Configurations: Id: 'windows-11_23H2-llvm' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'Clang' - Features: ['Packaging','Sccache', 'UseConfigure'] + Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 891a19df..229025fc 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -41,7 +41,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 21b9b30d..99de2f65 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -24,7 +24,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 12f0a335..15ba8fe9 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -23,7 +23,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', @@ -39,7 +39,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -55,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 34b26141..fb46da2c 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -19,7 +19,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', @@ -33,7 +33,7 @@ Configurations: Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index d715b338..926e027f 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -12,7 +12,7 @@ Configurations: Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',