diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-06-25 09:47:54 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2019-11-29 09:23:07 +0200 |
| commit | 26404dd4b6c61083bf5de1c1c2208bf2350aba0e (patch) | |
| tree | 1ae570e6b9573ce815f16c7a51c3ab3ffed4088f /coin_build_instructions.py | |
| parent | 1fb6ba555dbe908e48a61de50418866328e5b8b1 (diff) | |
Take new Qt CI config into use
Change-Id: I32fcdaa2df6a4bed4f3263875ab1ad272ad8ff8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index cd55b9bcd..8df12ee4c 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -43,9 +43,10 @@ from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree from build_scripts.utils import get_python_dict -from build_scripts.utils import acceptCITestConfiguration from build_scripts.utils import get_ci_qmake_path import os +import datetime +import calendar # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -56,7 +57,7 @@ CI_HOST_OS_VER = option_value("osVer") CI_ENV_INSTALL_DIR = option_value("instdir") CI_ENV_AGENT_DIR = option_value("agentdir") CI_COMPILER = option_value("compiler") -CI_INTEGRATION_ID = option_value("coinIntegrationId") +CI_INTEGRATION_ID = option_value("coinIntegrationId") or str(calendar.timegm(datetime.datetime.now().timetuple())) CI_FEATURES = [] _ci_features = option_value("features") if _ci_features is not None: @@ -140,7 +141,6 @@ def call_setup(python_ver, phase): env = os.environ run_instruction(cmd, "Failed to run setup.py for build", initial_env=env) - def run_build_instructions(phase): # Uses default python, hopefully we have python2 installed on all hosts @@ -148,12 +148,11 @@ def run_build_instructions(phase): if CI_HOST_OS != "Windows": call_setup("", phase) # In case of packaging build, we have to build also python3 wheel + if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: call_setup("3", phase) if __name__ == "__main__": - if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): - exit() # Remove some environment variables that impact cmake for env_var in ['CC', 'CXX']: |