From dcacb0be973cfc17f495fef6d2da73471c3360ea Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 23 Jul 2024 18:39:08 +0200 Subject: [PATCH] coin: Enable generation and linting of source SBOM This will enable generation and linting of source SBOMs only if the repository source root contains a REUSE.toml file. Otherwise the steps will be skipped. Task-number: QTBUG-122899 Task-number: QTBUG-125211 Change-Id: I87ea9aad7fb4f15ec7fa9d00072c81cddbe7ea2c Reviewed-by: Alexey Edelev (cherry picked from commit 186d368f0d613d7d1b60a6d1dc197269ab4db8f8) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/prepare_building_env.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 44db1d2585c..b48bd153474 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -482,16 +482,16 @@ instructions: instructions: - type: AppendToEnvironmentVariable variableName: COMMON_CMAKE_ARGS - variableValue: " -DQT_GENERATE_SBOM=ON" + variableValue: " -DQT_GENERATE_SBOM=ON -DQT_GENERATE_SOURCE_SBOM=ON" - type: AppendToEnvironmentVariable variableName: COMMON_NON_QTBASE_CMAKE_ARGS - variableValue: " -DQT_GENERATE_SBOM=ON" + variableValue: " -DQT_GENERATE_SBOM=ON -DQT_GENERATE_SOURCE_SBOM=ON" - type: AppendToEnvironmentVariable variableName: COMMON_TARGET_CMAKE_ARGS - variableValue: " -DQT_GENERATE_SBOM=ON" + variableValue: " -DQT_GENERATE_SBOM=ON -DQT_GENERATE_SOURCE_SBOM=ON" - type: AppendToEnvironmentVariable variableName: COMMON_NON_QTBASE_TARGET_CMAKE_ARGS - variableValue: " -DQT_GENERATE_SBOM=ON" + variableValue: " -DQT_GENERATE_SBOM=ON -DQT_GENERATE_SOURCE_SBOM=ON" # SBOM Python apps path. On Windows python-installed apps are # in the same directory where pip is, aka Scripts sub-directory. @@ -521,6 +521,7 @@ instructions: - type: EnvironmentVariable variableName: SBOM_COMMON_ARGS variableValue: >- + -DQT_LINT_SOURCE_SBOM=ON -DQT_INTERNAL_NO_SBOM_FIND_PYTHON_FRAMEWORK=ON -DQT_INTERNAL_SBOM_DEFAULT_CHECKS=ON -DQT_INTERNAL_SBOM_AUDIT=ON