From 2822db26be611f7b977c325e6cd39f6c18e7cdc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 7 Oct 2024 14:45:31 +0300 Subject: [PATCH] CI: Set SBOM_PYTHON_APPS_PATH env variable only if not set already Change-Id: Ie8849721ff576079d708412c441cdf4830dbe427 Reviewed-by: Toni Saario Reviewed-by: Alexandru Croitor (cherry picked from commit cfa106c7d48167c1ae36dd56391de801758a0383) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/prepare_building_env.yaml | 24 +++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index fc6928f08f6..69f25cc335f 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -499,16 +499,26 @@ instructions: variableName: SBOM_PYTHON_APPS_PATH variableValue: "{{.Env.PIP3_PATH}}" enable_if: - condition: property - property: host.os - equals_value: Windows + condition: and + conditions: + - condition: property + property: host.os + equals_value: Windows + - condition: runtime + env_var: SBOM_PYTHON_APPS_PATH + equals_value: null - type: EnvironmentVariable variableName: SBOM_PYTHON_APPS_PATH variableValue: "{{.Env.PYTHON3_PATH}}" - disable_if: - condition: property - property: host.os - equals_value: Windows + enable_if: + condition: and + conditions: + - condition: property + property: host.os + not_equals_value: Windows + - condition: runtime + env_var: SBOM_PYTHON_APPS_PATH + equals_value: null # SBOM verification and auditing