Skip to content

Commit

Permalink
Fix Pyside build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
faltsi committed May 29, 2018
1 parent 751653a commit 8d5e491
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions coin_build_instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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("")

Expand Down
8 changes: 8 additions & 0 deletions coin_test_instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8d5e491

Please sign in to comment.