diff options
author | Simo Fält <simo.falt@qt.io> | 2018-06-01 23:14:31 +0300 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-02 12:17:10 +0000 |
commit | a50f4de8d5116f032609d97a986801888b1008f7 (patch) | |
tree | c773a13d3dc481f588d3ef432df57f8da148d0b0 | |
parent | e4e72eae189e57c255193aa8ee556a3d9936d110 (diff) |
Enable 32 bit windows build
Task-number: PYSIDE-646
Change-Id: I783f4e91d37aeb0200f4546b49abdfe80a09afbf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | coin_build_instructions.py | 10 | ||||
-rw-r--r-- | coin_test_instructions.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 91a900518..f9f8d4d17 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -98,9 +98,7 @@ def call_setup(python_ver): run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") install_pip_dependencies(env_pip, ["six", "wheel"]) cmd = [env_python, "setup.py"] - # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 - # we shouldn't release the 2015 version. - if CI_RELEASE_CONF and CI_COMPILER not in ["MSVC2015"]: + if CI_RELEASE_CONF: cmd += ["bdist_wheel", "--standalone"] else: cmd += ["build"] @@ -127,8 +125,10 @@ def run_build_instructions(): if CI_HOST_OS_VER in ["WinRT_10"]: print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") exit() - if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": - print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 + # we shouldn't release the 2015 version. BUT, 32 bit build is done only on msvc 2015... + if CI_COMPILER in ["MSVC2015"] and CI_TARGET_ARCH in ["X86_64"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") exit() # Uses default python, hopefully we have python2 installed on all hosts diff --git a/coin_test_instructions.py b/coin_test_instructions.py index c9c184dd0..350e33b0d 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -76,8 +76,8 @@ def run_test_instructions(): if CI_HOST_OS_VER in ["WinRT_10"]: print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") exit() - if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": - print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + if CI_COMPILER in ["MSVC2015"] and CI_TARGET_ARCH in ["X86_64"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") exit() os.chdir(CI_ENV_AGENT_DIR) |