summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Skoland <david.skoland@qt.io>2022-09-16 14:50:58 +0200
committerDavid Skoland <david.skoland@qt.io>2022-10-15 19:50:41 +0200
commite60e8c4ef6638fa00151307e34493f4e1dcb7df2 (patch)
treeb1d7d088b88f91f636f8bfd6a0071be7f6c20957
parentf8c6151de19afbfee47e0f1c554c90feba6bfabb (diff)
wasm: Add WebAssembly to platform of built tests on module-only build
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 <morten.sorvig@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
-rw-r--r--coin/instructions/coin_module_build_template_v2.yaml4
-rw-r--r--coin/instructions/coin_qtbase_build_template_v2.yaml4
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 ed832a1720..14c8555854 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 d29bc3ebb9..904d19819b 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