From ec8edcaa33985291d4f68bf55fdc8c07bf9aefaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 31 May 2019 08:31:06 +0300 Subject: [PATCH] Disable Ubuntu 18.04 NoGui configuration from CI Change-Id: I57783a5da7b403e45463068900c1248fbd3651f9 Reviewed-by: Christian Tismer --- build_scripts/utils.py | 2 +- coin_test_instructions.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 460c1b21fb..b34d371237 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 2a42ec6773..acb27875da 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -61,7 +61,6 @@ 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):