1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coin: Always pass the SBOM python interpreter to configure

Browse Source 
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 <joerg.bornemann@qt.io>
(cherry picked from commit 1f8236236b86aac1a62c405ee8f186cd43e5ff17)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-10-17 20:45:44 +02:00 committed by Qt Cherry-pick Bot
parent 4bf5a5037e
commit f60bc34be7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
coin/instructions/prepare_building_env.yaml
View File

@ -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}} "