diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-06-11 12:13:51 +0300 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-11 21:53:26 +0000 |
| commit | 14a583c7cc2db606bc2301721cae63f07273e630 (patch) | |
| tree | 3cf73cc7b0fc1ffcffce157475b0b77334c12680 /coin_build_instructions.py | |
| parent | 1919b8d20cf8b6207a87fd5bf38f37d27d371bd8 (diff) | |
We are missing the required provisioning script from Qt5 5.11.0 branch,
so we are installing the 32 bit Python environments ourselves.
Change-Id: Icd95a4708bc9e5693bb21b31c0e9d30d6fd632e6
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 65e198be4..df4bc9b67 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -44,6 +44,7 @@ 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 runCIProvisioning import os # Values must match COIN thrift @@ -125,6 +126,10 @@ def run_build_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + # Make sure we have 32 bit python on 64 bit host + # FIXME this is hack for 5.11.0 + if CI_HOST_OS == "Windows" and CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": + runCIProvisioning() # Uses default python, hopefully we have python2 installed on all hosts # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) if CI_HOST_OS != "Windows": |