diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-06-01 23:48:46 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2018-06-04 12:38:19 +0000 |
| commit | 33943b54e9470dc8830e94270e6521524acb2954 (patch) | |
| tree | d97fbd7f1fe82dd3bce3aa3d78a98194bf9ffbc7 /build_scripts | |
| parent | a50f4de8d5116f032609d97a986801888b1008f7 (diff) | |
Refactor accepted CI configurations
Change-Id: I7baa695fe4100e15b108e4eb7df15c6af7db2cbe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/utils.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index cca93d09f..f535db636 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1117,3 +1117,16 @@ def run_instruction(instruction, error): if result != 0: print("ERROR : " + error) exit(result) + +def acceptCITestConfiguration(hostOS, hostOSVer, targetArch, compiler): + # Disable unsupported CI configs for now + # NOTE: String must match with QT CI's storagesturct thrift + if hostOSVer in ["WinRT_10"]: + 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 + # we shouldn't release the 2015 version. BUT, 32 bit build is done only on msvc 2015... + if compiler in ["MSVC2015"] and targetArch in ["X86_64"]: + print("Disabled " + compiler + " to " + targetArch + " from Coin configuration") + return False + return True |