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> | 2020-02-27 18:28:01 +0200 |
| commit | b2388fc809710655464ed99a5a80a6af35ecf503 (patch) | |
| tree | a2b0ea205f0c9ff200b8b42c34786f38903c8e0d /coin_build_instructions.py | |
| parent | 65269388f18f12f56aac9315160a747a402cab69 (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>
(cherry picked from commit 26404dd4b6c61083bf5de1c1c2208bf2350aba0e)
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index dbdbdbd0d..e35bcda3b 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: @@ -149,9 +150,6 @@ def run_build_instructions(phase): 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']: if os.environ.get(env_var): |