diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-21 08:18:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-22 07:38:29 +0200 |
| commit | 6eb583d77019ad03112c188b20063e2199486235 (patch) | |
| tree | dd60ba6b8ac7397b347aebc4e801d37c9028e4df /build_scripts/utils.py | |
| parent | b33f0c3708c16821a846013d28ca600863003b3e (diff) | |
| parent | d9225ff6dd397af9558a882de2a33a981e994a53 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into dev"
Diffstat (limited to 'build_scripts/utils.py')
| -rw-r--r-- | build_scripts/utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 5375e9f8a..dc90d99b7 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1141,7 +1141,8 @@ 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", "Ubuntu_18_04"]: + if hostOSVer in ["WinRT_10", "WebAssembly", "Ubuntu_18_04"] \ + or hostOSVer.startswith("SLES_"): 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 |