diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-16 09:02:59 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-16 09:02:59 +0200 |
commit | bdddb45ad8892e1a0ea3e93014f729af41460397 (patch) | |
tree | 150e71aee2478d1a140f615659177102f1dba289 | |
parent | a153826d0520b7772d459af80d05d31f9c1a9872 (diff) | |
parent | a790865e3159a12e427a6b55114bdbd05881ce9d (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0f71c6ca75fae7e1eff6675d787891507d4dd965
-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 |