Commit Graph

10 Commits

Author SHA1 Message Date
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
2019-11-11 10:52:16 +01:00
Dimitrios Apostolou
72111504ea Update epel package to latest version
The online repo only contains the latest version.

Change-Id: I2dfbc3c2a873ed3758672682b09c0205bfa19549
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:05 +02:00
Dimitrios Apostolou
482552d813 First try cached URL before hitting the official repo
Change-Id: Id0cf89090155459fd660d55ce427cd34bf3136f5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:02 +02:00
Dimitrios Apostolou
c6a9b3cd68 Update previously committed patch to match the branch's platforms
Task-number: QTQAINFRA-3092
Change-Id: I598759f0624e478a07cfe3256cbeba2f2b8bfe02
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-15 12:41:00 +02:00
Liang Qi
0c687679c7 platform_configs: add Android arm64 build on RHEL 7.6 host
* install vcpkg and for android
* a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506

Task-number: QTBUG-78945
Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-11 18:56:33 +00:00
Liang Qi
9e3b3c838c platform_configs: add a RHEL 7.6 build
A preparing for having android build later.

* install gcc 7.x
* install git 2.x
* install a few other dependencies

Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-10 05:34:27 +00:00
Dimitrios Apostolou
acfc7ad18d Fix message "RPMDB altered outside of yum"
yum install supports a local filename on RHEL 6 or newer.

Change-Id: I873ab3dfab56003ded45bc6c4099aae150f423dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:06 +02:00
Dimitrios Apostolou
c87a6e9c6d Fix delays caused by PackageKit locking RPMDB
It seems that disabling it is not enough, it has to be fully removed.
It is also removed later in the scripts but it wasn't enough apparently,
so no harm done removing it twice.

Change-Id: If1a4f032240e66100b68bca3196a700cb570701e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:02 +02: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
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