From 0fe2d4c7a4f57c888dfca8471ca4ee4898a9fe23 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 10 Apr 2025 16:58:55 +0200 Subject: [PATCH] Add python version marker to sbom requirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids needing a special handle for the RHEL8 runner Change-Id: I8e6131e3b3da35d66b86a8371f31c8680049a90d Reviewed-by: Simo Fält --- coin/provisioning/common/shared/requirements.txt | 2 +- coin/provisioning/common/shared/sbom_requirements.txt | 10 +++++----- .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/shared/requirements.txt b/coin/provisioning/common/shared/requirements.txt index cde698e9..3bf1c93e 100644 --- a/coin/provisioning/common/shared/requirements.txt +++ b/coin/provisioning/common/shared/requirements.txt @@ -1,2 +1,2 @@ -# Requirements for running sbom +# Requirements for running SBOM related utilities -r sbom_requirements.txt diff --git a/coin/provisioning/common/shared/sbom_requirements.txt b/coin/provisioning/common/shared/sbom_requirements.txt index 8eaf1238..fbf6d1d3 100644 --- a/coin/provisioning/common/shared/sbom_requirements.txt +++ b/coin/provisioning/common/shared/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' diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index b083fbec..161a4adb 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -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