From f60bc34be7060946eede88122665a3b40b40075a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 17 Oct 2024 20:45:44 +0200 Subject: [PATCH] coin: Always pass the SBOM python interpreter to configure The Qt default has changed to always generate an SBOM for all platforms in the CI, so we always want to pass the location of the python interpreter meant for SBOM processing to configure. Task-number: QTBUG-122899 Change-Id: I1042c97b9133ca37e42eb3efd1689ec1f9f9ab31 Reviewed-by: Joerg Bornemann (cherry picked from commit 1f8236236b86aac1a62c405ee8f186cd43e5ff17) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/prepare_building_env.yaml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 45ae506da37..a843ed92b2a 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -520,6 +520,25 @@ instructions: env_var: SBOM_PYTHON_APPS_PATH equals_value: null + # Always pass the location of the python intrepreter meant to be used for SBOM generation, + # because the Qt default has changed to always generate an SBOM. + - type: EnvironmentVariable + variableName: SBOM_PYTHON_ARGS + variableValue: >- + -DQT_SBOM_PYTHON_INTERP={{.Env.PYTHON3_PATH}} + -DQT_SBOM_PYTHON_APPS_PATH={{.Env.SBOM_PYTHON_APPS_PATH}} + - type: AppendToEnvironmentVariable + variableName: COMMON_CMAKE_ARGS + variableValue: " {{.Env.SBOM_PYTHON_ARGS}} " + - type: AppendToEnvironmentVariable + variableName: COMMON_NON_QTBASE_CMAKE_ARGS + variableValue: " {{.Env.SBOM_PYTHON_ARGS}} " + - type: AppendToEnvironmentVariable + variableName: COMMON_TARGET_CMAKE_ARGS + variableValue: " {{.Env.SBOM_PYTHON_ARGS}} " + - type: AppendToEnvironmentVariable + variableName: COMMON_NON_QTBASE_TARGET_CMAKE_ARGS + variableValue: " {{.Env.SBOM_PYTHON_ARGS}} " # SBOM verification and auditing - type: Group @@ -535,8 +554,6 @@ instructions: -DQT_INTERNAL_SBOM_DEFAULT_CHECKS=ON -DQT_INTERNAL_SBOM_AUDIT=ON -DQT_INTERNAL_SBOM_AUDIT_NO_ERROR=ON - -DQT_SBOM_PYTHON_INTERP={{.Env.PYTHON3_PATH}} - -DQT_SBOM_PYTHON_APPS_PATH={{.Env.SBOM_PYTHON_APPS_PATH}} - type: AppendToEnvironmentVariable variableName: COMMON_CMAKE_ARGS variableValue: " {{.Env.SBOM_COMMON_ARGS}} "