From e60e8c4ef6638fa00151307e34493f4e1dcb7df2 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 16 Sep 2022 14:50:58 +0200 Subject: [PATCH] wasm: Add WebAssembly to platform of built tests on module-only build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to make a test for wasm run in CI, and have to start small with qtbase. This lets the tests compile and run. Additionally, reordered the platforms for full consistency. Apply the same change to the qtbase config. Change-Id: If3cedffdd7f1b21215c05b9b9302df8234a47a0c Reviewed-by: Morten Johan Sørvig Reviewed-by: Toni Saario --- coin/instructions/coin_module_build_template_v2.yaml | 4 ++-- coin/instructions/coin_qtbase_build_template_v2.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml index ed832a1720c..14c8555854e 100644 --- a/coin/instructions/coin_module_build_template_v2.yaml +++ b/coin/instructions/coin_module_build_template_v2.yaml @@ -33,13 +33,13 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] enable_if: condition: or conditions: - condition: property property: target.osVersion - in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] - condition: and conditions: - condition: property diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml index d29bc3ebb91..904d19819ba 100644 --- a/coin/instructions/coin_qtbase_build_template_v2.yaml +++ b/coin/instructions/coin_qtbase_build_template_v2.yaml @@ -26,13 +26,13 @@ instructions: enable_if: condition: property property: target.osVersion - in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] enable_if: condition: or conditions: - condition: property property: target.osVersion - in_values: [IOS_ANY, Android_ANY, QEMU, QNX_710, WebAssembly, INTEGRITY] + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY] - condition: and conditions: - condition: property