diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-02-28 09:49:04 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2024-02-28 10:45:55 +0200 |
| commit | 3d24cf932e977aa28ffd67f297fd7092c004854b (patch) | |
| tree | a0918b687ce400a6c4070ac130e4fc44559603f0 | |
| parent | aba4fef997d50788c506270d786075a3a308eff0 (diff) | |
CI: Adapt to new Windows and macOS configs
Change-Id: Ia1c32b2043ca22f916dd738934beac6f57944bbb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 03f865bdb..8f9577bb5 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -18,7 +18,7 @@ accept_configuration: not_contains_value: UseLegacyInstructions - condition: property # MinGW and msvc2015 are not supported property: target.compiler - not_in_values: [Mingw, MSVC2015] + not_in_values: [Mingw, MSVC2015,Clang] - condition: property # Webassembly property: target.osVersion not_equals_value: WebAssembly @@ -30,23 +30,21 @@ accept_configuration: not_contains_value: DebianPackaging - condition: and conditions: - - condition: property # No cross compilation - property: host.osVersion - equals_value: MacOS_10_15 + - condition: property + property: host.os + equals_value: MacOS - condition: property property: features contains_value: TestOnly - condition: property property: features contains_value: Packaging - - condition: and - conditions: - condition: property - property: host.osVersion - equals_value: MacOS_11_00 + property: target.os + not_contains_value: Android - condition: property - property: features - contains_value: Packaging + property: target.os + not_contains_value: IOS - condition: and conditions: - condition: property |