From 14a583c7cc2db606bc2301721cae63f07273e630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 11 Jun 2018 12:13:51 +0300 Subject: Fix Win CI node to allow 32 bit wheels 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 --- coin_build_instructions.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'coin_build_instructions.py') 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": -- cgit v1.2.3