diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-02-19 11:28:39 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2024-02-22 15:54:25 +0000 |
| commit | df1efc70b0cb3eeff4c59adbf58702af1d9a9200 (patch) | |
| tree | 7c15d0a29d508c9cad08e50b21ccff15e2f36d98 | |
| parent | 576c9160b12ac5efc76d06ca7ccc856aad2b051a (diff) | |
COIN: Move skipping Debian instructions to qt5 repo
Pick-to: 6.6 6.7
Task-number: QTBUG-122447
Change-Id: I385d60d891c68edc3aa053d3561335a46b26923b
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/instructions/debian/prepare_debian_env.yaml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml index ab8d51ab60..c51de2103c 100644 --- a/coin/instructions/debian/prepare_debian_env.yaml +++ b/coin/instructions/debian/prepare_debian_env.yaml @@ -54,20 +54,10 @@ instructions: variableName: COIN_SKIP_DEBIAN variableValue: "MISSING_DEBIAN_INST" enable_if: - condition: or - conditions: - - condition: runtime - env_var: TESTED_MODULE_COIN - equals_value: "qtactiveqt" - - condition: runtime - env_var: TESTED_MODULE_COIN - equals_value: "qtqa" - - condition: runtime - env_var: TESTED_MODULE_COIN - equals_value: "qtdoc" - - condition: runtime - env_var: TESTED_MODULE_COIN - equals_value: "qt5" + condition: runtime + env_var: COIN_SKIP_DEBIAN_MODULES + contains_value: "{{.Env.TESTED_MODULE_COIN}}" + # Set version info to environment - type: ParseEnvironmentVariableFromFile regex: "QT_REPO_MODULE_VERSION \"(?P<QT_REPO_MODULE_VERSION>.*)\"" |