diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 15:18:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 15:18:37 +0200 |
| commit | d9f4a921ca88bf0bd340f42a874cf7c22b6b1a36 (patch) | |
| tree | 3b4d20a6fc4ea61fa6b1eabe0e8a955dcec176c6 /build_scripts/utils.py | |
| parent | 4c4fdca8ee3ee3807dd3d56876cfcc1ea1a8cac8 (diff) | |
| parent | 41b864397ab9f999a7b140b12d2117b8492ed066 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'build_scripts/utils.py')
| -rw-r--r-- | build_scripts/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 460c1b21f..b34d37123 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1148,7 +1148,7 @@ def run_instruction(instruction, error, initial_env=None): def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): # Disable unsupported CI configs for now # NOTE: String must match with QT CI's storagestruct thrift - if hostOSVer in ["WinRT_10", "WebAssembly"]: + if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"]: print("Disabled " + hostOSVer + " from Coin configuration") return False # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 |