diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-05-31 08:31:06 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2019-05-31 09:14:58 +0300 |
| commit | ec8edcaa33985291d4f68bf55fdc8c07bf9aefaf (patch) | |
| tree | 7b8969f8c9bdbe1cad540cbe6e91549fec05d7fe | |
| parent | 0fc54b04d6f47b74a35e4d13d5f62e459db20132 (diff) | |
Disable Ubuntu 18.04 NoGui configuration from CI
Change-Id: I57783a5da7b403e45463068900c1248fbd3651f9
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | build_scripts/utils.py | 2 | ||||
| -rw-r--r-- | coin_test_instructions.py | 1 |
2 files changed, 1 insertions, 2 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 diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 2a42ec677..acb27875d 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -61,7 +61,6 @@ _ci_features = option_value("features") if _ci_features is not None: for f in _ci_features.split(', '): CI_FEATURES.append(f) - CI_RELEASE_CONF = has_option("packaging") def call_testrunner(python_ver, buildnro): |