aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-08-12 16:32:06 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-08-13 10:29:34 +0200
commit5da22789484add3cd87b1f36f406571091841d20 (patch)
treee5eb9c85a418f94c4dd3b92a8732d419d170fe38
parent0f4cf6d96561a0a635c78cef7636ae6fe97a7353 (diff)
CMake: Enable enforcing CI tests
Any failing tests in CMake configurations will now prevent integrations to go through in this repository. Task-number: QTBUG-84886 Change-Id: I48614c2cfff615542866367b979b76a6d9e4d585 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--coin/module_config.yaml17
1 files changed, 8 insertions, 9 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index d554c07..1000d45 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,18 +1,17 @@
-version: 1
+version: 2
accept_configuration:
condition: property
- property: host.os
- equals_property: target.os
+ property: features
+ not_contains_value: Disable
-build_instructions:
- - !include "{{qt/qtbase}}/prepare_building_env.yaml"
- - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
- - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
+instructions:
+ Build:
+ - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
-test_instructions:
+ Test:
- type: Group
instructions:
- - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
+ - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml"
enable_if:
condition: property
property: host.os