diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-01-23 09:58:37 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-01-24 10:52:17 +0100 |
| commit | 422546c884b9115cc2f1ba35bca36cc09a0a71ec (patch) | |
| tree | eb588d0fe2430dfd81d35ab97f9ad5397372f8bf | |
| parent | 246471a5b70548b0230db96755b9f519172aadad (diff) | |
Use qt5 5.14.1 in CI
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>
| -rw-r--r-- | coin_test_instructions.py | 3 | ||||
| -rw-r--r-- | product_dependencies.yaml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 5c20e9848..65c564df5 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -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] diff --git a/product_dependencies.yaml b/product_dependencies.yaml new file mode 100644 index 000000000..869c89089 --- /dev/null +++ b/product_dependencies.yaml @@ -0,0 +1,3 @@ +dependencies: + ../../qt/qt5.git: + ref: "5.14.1" |