mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-04 15:36:24 +08:00
Add python version marker to sbom requirements
Avoids needing a special handle for the RHEL8 runner Change-Id: I8e6131e3b3da35d66b86a8371f31c8680049a90d Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
# Requirements for running sbom
|
||||
# Requirements for running SBOM related utilities
|
||||
-r sbom_requirements.txt
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Python packages used to validate and audit Qt SBOM informaiton
|
||||
spdx-tools>=0.8.0
|
||||
ntia-conformance-checker
|
||||
sbomaudit
|
||||
sbom2doc
|
||||
reuse
|
||||
spdx-tools>=0.8.0 ; python_version >= '3.9'
|
||||
ntia-conformance-checker ; python_version >= '3.9'
|
||||
sbomaudit ; python_version >= '3.9'
|
||||
sbom2doc ; python_version >= '3.9'
|
||||
reuse ; python_version >= '3.9'
|
||||
|
||||
@@ -177,7 +177,7 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requiremen
|
||||
|
||||
sudo /usr/bin/pip3 install wheel
|
||||
sudo /usr/bin/pip3 install dataclasses
|
||||
# No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8
|
||||
sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
Reference in New Issue
Block a user