From 6e378b6efdfd322a91010c3592ad067c9c7aad67 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 9 Apr 2021 18:06:57 +0200 Subject: coin: Simplify build conditions and allow WebAssembly non-qtbase repos Rather than using multiple layers of negation, we can just specify a list of allowed configs. Allow cross-building other repos when targeting WebAssembly. Be explicit about not building Android tests for repos other than qtbase (until that is not longer desired). Currently the qt5 platform configuration only has qtbase marked with the AndroidTestRun feature. Amends fd16c65b7ec9921a48bdbc42c22259c87c7fbade Amends 13c460d0ff1a4eecfb7b1bc43a863783ed59a2bd Superseeds 60a5b7be03f5800caa8a117c3b07b60d8fb208ec Change-Id: If8de002e0c9f748b43e3d2271ac283462603b2e6 Reviewed-by: Toni Saario --- .../coin_module_build_template_v2.yaml | 25 +++++++--------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'coin') diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index 92532f5cb8..731f19c648 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -20,7 +20,7 @@ instructions: equals_property: target.os - condition: property property: target.osVersion - not_equals_value: QEMU + not_in_values: [QEMU, WebAssembly] - type: Group instructions: - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml" @@ -28,20 +28,11 @@ instructions: instructions: - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts_target.yaml" enable_if: - condition: and - conditions: - - condition: property - property: host.os - equals_property: target.os - - condition: property - property: target.osVersion - equals_value: QEMU - disable_if: - condition: and - conditions: - - condition: property - property: host.os - equals_property: target.os - - condition: property + condition: property property: target.osVersion - not_equals_value: QEMU + # We don't currently build tests for Android other than qtbase repo + in_values: [QEMU] + enable_if: + condition: property + property: target.osVersion + in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly] -- cgit v1.2.3