diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-11-30 12:50:34 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-11-30 13:09:58 +0000 |
| commit | f4fd97655f20e2ce4d24704056b7a7a9ab9db355 (patch) | |
| tree | 03d6718a08169dd792e08928038ce30da8c1211c | |
| parent | f67d44292f0584c0718792653fad4b9746e64595 (diff) | |
Adjust accepted CI configs for QtForPython version 6
Change-Id: I29dcee812fe15cdc05403eb9ce7146a1bad85dcf
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index fd80acf9e..20a5e59c5 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -2,34 +2,23 @@ version: 2 accept_configuration: condition: or conditions: - - condition: and - conditions: - - condition: property # No cross compilation - property: host.os - equals_property: target.os - - condition: property # qtnamespace is not supported - property: configureArgs - not_contains_value: -qtnamespace - - condition: property # no-widgets is notsupported - property: configureArgs - not_contains_value: -no-widgets - - condition: property # no-gui is not supported - property: configureArgs - not_contains_value: -no-gui - - condition: property # Following configs are not supported - property: target.osVersion - not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15] - - condition: property # MibnGW and msvc2015 are not supported - property: target.compiler - not_in_values: [Mingw, MSVC2015] - - condition: and - conditions: - - condition: property - property: target.osVersion - equals_value: Ubuntu_18_04 - - condition: property - property: features - contains_value: LicenseCheck + - condition: property + property: features + contains_value: LicenseCheck + - condition: and + conditions: + - condition: property # No cross compilation + property: host.os + equals_property: target.os + - condition: property + property: features + contains_value: Packaging + - condition: property + property: features + not_contains_value: UseLegacyInstructions + - condition: property # MibnGW and msvc2015 are not supported + property: target.compiler + not_in_values: [Mingw, MSVC2015] upload_pyside: &upload_pyside type: Group |