diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-19 09:01:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-19 09:01:29 +0200 |
| commit | cb93ce335cda4b8a8214350b157c55f0c80062d9 (patch) | |
| tree | dd60ba6b8ac7397b347aebc4e801d37c9028e4df /build_scripts/utils.py | |
| parent | 29ab4674dc90c216ab17c7a8022f529f9a46eef7 (diff) | |
| parent | 1b923556f315d22e5ac6febce8ddafb4cb2dd8a2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I56b8450c17fd83a24ee2ec9eb8f66f3530caba6c
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 |