summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2018-05-29 10:00:43 +0300
committerSimo Fält <simo.falt@qt.io>2018-05-29 08:32:41 +0000
commit8d5e491eaeb3188154135a6ef8e9400983c4bafa (patch)
treee7882bc776acc3caa211f6db96f5a0791c543597
parent751653a4f5a73a9499d5690b93fa582208d5bd47 (diff)
Fix Pyside build
Disabling some of the configurations due to fact that those are not supported yet. 32 bit windows build on 64 bit host will be re-enabled once we get 32 bit python provisioned to 64 bit windows. Change-Id: I74492ed654dfef5aaf8e02ca8e0c715a0c27d2c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--coin_build_instructions.py8
-rw-r--r--coin_test_instructions.py8
2 files changed, 16 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 17551357..ad433184 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -89,6 +89,14 @@ def call_setup(python_ver):
run_instruction(cmd, "Failed to run setup.py")
def run_build_instructions():
+ # Disable unsupported configs for now
+ 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")
+ exit()
+
# Uses default python, hopefully we have python2 installed on all hosts
call_setup("")
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 29b66454..c9c184dd 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -72,6 +72,14 @@ def call_testrunner(python_ver, buildnro):
run_instruction(cmd, "Failed to run testrunner.py")
def run_test_instructions():
+ # Disable unsupported configs for now
+ 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")
+ exit()
+
os.chdir(CI_ENV_AGENT_DIR)
call_testrunner("", "0")
# We know that second build was with python3