diff options
| -rw-r--r-- | coin/instructions/coin_module_build_template_v2.yaml | 22 | ||||
| -rw-r--r-- | coin/instructions/coin_qtbase_build_template_v2.yaml | 22 |
2 files changed, 32 insertions, 12 deletions
diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index a05b4ba915..8fa5729590 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -6,13 +6,23 @@ instructions: - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml" - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" enable_if: - condition: property - property: host.os - equals_property: target.os + condition: and + conditions: + - condition: property + property: host.os + equals_property: target.os + - condition: property + property: target.osVersion + not_equals_value: QEMU - type: Group instructions: - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml" disable_if: - condition: property - property: host.os - equals_property: target.os + condition: and + conditions: + - condition: property + property: host.os + equals_property: target.os + - condition: property + property: target.osVersion + not_equals_value: QEMU diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index de7a5b8e11..433b326e25 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -6,13 +6,23 @@ instructions: - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml" - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" enable_if: - condition: property - property: host.os - equals_property: target.os + condition: and + conditions: + - condition: property + property: host.os + equals_property: target.os + - condition: property + property: target.osVersion + not_equals_value: QEMU - type: Group instructions: - !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml" disable_if: - condition: property - property: host.os - equals_property: target.os + condition: and + conditions: + - condition: property + property: host.os + equals_property: target.os + - condition: property + property: target.osVersion + not_equals_value: QEMU |