Skip to content

Commit

Permalink
Use qt5 5.14.1 in CI
Browse files Browse the repository at this point in the history
Qt5 5.14 is currently broken from Qt For Python point of view,
so we should verify Qt For Python against 5.14.1. This patch
should be reverted once Qt branches are fixed.

Change-Id: I8a0249284665381decc42f94faab6d8e9650f8bb
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
  • Loading branch information
faltsi authored and cmaureir committed Jan 24, 2020
1 parent 246471a commit 422546c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 1 addition & 2 deletions coin_test_instructions.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ def call_testrunner(python_ver, buildnro):
_pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH)
rmtree(_env, True)
run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv")
# Keeping PyInstaller 3.4, because 3.5 seems to have broken our test
install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.4", "wheel"])
install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.6", "wheel"])
cmd = [env_python, "testrunner.py", "test",
"--blacklist", "build_history/blacklist.txt",
"--buildno=" + buildnro]
Expand Down
3 changes: 3 additions & 0 deletions product_dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencies:
../../qt/qt5.git:
ref: "5.14.1"

0 comments on commit 422546c

Please sign in to comment.