Commit Graph

1049 Commits

Author SHA1 Message Date
Jędrzej Nowacki
36d634a7dd Fix paths when installing cmake on macOS
This ammends d44a7a5f14.

Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-06 07:38:52 +00:00
Simon Hausmann
716cb8185a Fix path to cmake installation script
Amends commit d44a7a5f14

Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 06:58:55 +00:00
Simon Hausmann
463235a0bc Bump cmake to 3.15-rc1
Same as for the recent Linux change.

Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-05 12:54:18 +00:00
Simon Hausmann
d44a7a5f14 Install cmake from binaries instead of from source
The from-source installation originates from a point in time where there
was no cmake release with binaries that were sufficient. That is not the
case with 3.15-rc1.

Change-Id: I385016969f21c194b25334e3af8af7283fc5873f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-05 12:47:18 +00:00
Jean-Michaël Celerier
086439b018 Upgrade CMake to 3.15.0-rc1
Change-Id: I374631637a6521621dfa702aa2390998ef124d24
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-05 09:21:01 +00:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-31 07:30:23 +00:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-26 08:14:11 +03:00
Liang Qi
aabcc8128c Provisioning: Add ninja to the list of installed packages
Change-Id: I018e7812fc95c1db841720294a700a391246251d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-24 09:58:03 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-22 15:34:04 +03:00
Juha Karjalainen
230a73409a Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 04:14:35 +00:00
Liang Qi
f557e0634f Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
2019-05-09 15:27:08 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-07 07:15:58 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
2019-05-04 11:04:32 +02:00
Liang Qi
21604cf7da Provisioning: install vcpkg and some packages on Windows 10
Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:37:10 +00:00
Liang Qi
4c655a140b Provisioning: install latest cmake - 3.14.1 on Windows
Change-Id: I461589be02c26e048d5975d59600376022d728fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:37:05 +00:00
Liang Qi
cb860d794d Provisioning: Add freetype to the list of installed packages on macOS
Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:57 +00:00
Liang Qi
705696e1d1 Provisioning: Add pcre2 to the list of installed packages
This external dependency is now required by QtCore on macOS.

Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:45 +00:00
Liang Qi
8b0a10d1c1 Provisioning: build cmake from source on macOS 10.13
Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:42 +00:00
Liang Qi
ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
2019-05-03 10:10:23 +02:00
Juha Karjalainen
6465c42122 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-03 07:30:44 +00:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-25 09:29:05 +00:00
Heikki Halmet
5db0ce74b7 Provisioning: Update QNX 7.0 packages
Updated packages includes QNX Multimedia Suite 2.0,
which enables building QtMultimedia QNX plugins

Task-number: QTBUG-71073
Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-04-24 13:27:06 +03:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-23 06:04:34 +00:00
Heikki Halmet
91ab567a64 Provisioning: Upgrade PyYAML because of possible security vulnerability
Known high severity security vulnerability in pyyaml v< 4.2b1

Task-number: QTQAINFRA-2888
Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-18 14:35:52 +03:00
Tony Sarajärvi
670aa09aba Provisioning: Fix cleanup when building GCC from sources
We need sudo rights to delete the temporary folder
where sources for GCC are extracted.

Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 13:45:06 +03:00
Liang Qi
34a13ff5d9 Merge remote-tracking branch 'origin/5.12.4' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
2019-06-25 10:29:08 +02:00
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 08:29:02 +03:00
Heikki Halmet
acff1703e4 Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 247b429c3c)
2019-06-10 10:19:00 +03:00
Juha Karjalainen
c8deeb3d05 Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 230a73409a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Juha Karjalainen
b9e92adf59 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6465c42122)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:06:56 +00:00
Juha Karjalainen
31f5c48a80 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3e838f2a34)
2019-06-10 10:07:20 +00:00
Heikki Halmet
a2b1dd2d0a Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dbaa42baa7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Heikki Halmet
608788de2d Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c09135cb56)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Tony Sarajärvi
f70bdd89b1 Update GCC version to 9.1.0 in Ubuntu 18.04
Task-number: QTQAINFRA-2958
Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-31 11:30:45 +03:00
Simo Fält
da9aac698d Provisioning: Install virtualenv to Ubuntu 18.04
The python3-virtualenv package is missing the actual virtualenv
executable. python3-virtualenv will get installed as dependency.

Change-Id: If474831e8f46ac5dcd7e1028c97c7322c5e41b9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:13:58 +03:00
Juha Karjalainen
94d140b746 Log more version information on macOS provisioning
Logs more version information to make easier to reproduce build.
Logs macOS build version, homebrew installed packages and apple's
installer installed packages.

Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 15:47:26 +00:00
Tony Sarajärvi
8f073cea69 Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-12 13:02:16 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-18 10:01:57 +00:00
Liang Qi
577d01e9df Provisioning: disable docker test servers on Windows 10 (x86_64)
This reverts commit 177df80f09 partially.

Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-04-16 08:57:44 +00:00
Liang Qi
e10a2d4ffe Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
2019-04-14 23:11:30 +02:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
2019-04-13 11:38:39 +02:00
Juha Karjalainen
48443b4b9a Provisioning: update python 2.7.14 to 2.7.16
Python 2.7.14 used tlsv1 which is no longer accepted by github
thus needing update to newer version.

Task-number: QTQAINFRA-2900
Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-11 06:10:22 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-10 06:06:56 +00:00
Heikki Halmet
b3e35cbac5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-09 09:17:20 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-08 06:36:50 +00:00
Heikki Halmet
c654e63c87 Update Windows 10, MSVC 2015 and MSVC 2017
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056

ms-zune is no longer available in the latest
Windows 10 version

dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.

Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-05 05:04:34 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:59 +00:00
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:52 +00:00
Heikki Halmet
c09135cb56 Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-01 11:42:49 +00:00