summaryrefslogtreecommitdiffstats
path: root/coin/module_config.yaml
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-11-14 11:51:11 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-02-07 10:05:51 +0000
commitd445112cc03d730d659d1eeaa84d963f85731ac5 (patch)
tree31acd09220502ff155f04a51deae539649b3467e /coin/module_config.yaml
parentb06f08646013bf3042fa86aa2343447ca8b57cef (diff)
cmake: upload artifact for qtbase android build and etc
Task-number: QTBUG-78945 Change-Id: I3361e63ed4830ac0e1ebb9d4b9495df09c45f476 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/module_config.yaml')
-rw-r--r--coin/module_config.yaml32
1 files changed, 2 insertions, 30 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index ab615583a5..5d50c02afe 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -6,35 +6,7 @@ accept_configuration:
instructions:
Build:
- - !include "{{qt/qtbase}}/prepare_building_env.yaml"
- - type: Group
- 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
- - type: Group
- instructions:
- - !include "{{qt/qtbase}}/cmake_cross_compilation.yaml"
- disable_if:
- condition: property
- property: host.os
- equals_property: target.os
+ - !include "{{qt/qtbase}}/coin_qtbase_build_template_v2.yaml"
Test:
- - type: Group
- instructions:
- - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
- enable_if:
- condition: property
- property: host.os
- equals_property: target.os
- - type: EnvironmentVariable
- variableName: Dummy
- variableValue: dummy
- disable_if:
- condition: property
- property: host.os
- equals_property: target.os
+ - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"