diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
| commit | b9a857b0fdcad47db958df635a5af934a8e90d62 (patch) | |
| tree | a82bee72783db8f9063d857205972e71b1df3994 /build_scripts | |
| parent | 768541fb2e81a426daeffc2f81dcca42ecc43919 (diff) | |
| parent | d9f4a921ca88bf0bd340f42a874cf7c22b6b1a36 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I920a77a3a8c79bba0fd7e5e4f990facf4081ca08
Diffstat (limited to 'build_scripts')
| -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 |