Commit Graph

4592 Commits

Author SHA1 Message Date
Heikki Halmet
634d196109 Provisioning: Refresh Subscription-manager
Subscription manager needs to be refreshed so that RedHat repositories
will stay available for provisioning scripts

Change-Id: Idebc994fbefde951000570f6690c6849abfd3666
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-03 07:15:36 +00:00
Tony Sarajärvi
baa46f9590 Provisioning: fix .ci.local addresses to .intra.qt.io
Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-03 07:15:33 +00:00
Liang Qi
d068364935 Update submodules on '5.10' in qt5
Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-03 05:14:29 +00:00
Liang Qi
037335f4bf Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7f1af5ed2b7653f36ebbcee5eb9255b57c4ca8af
2017-11-02 10:29:13 +01:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
Qt Submodule Update Bot
70f20ec55e Update submodules on 'dev' in qt5
Change-Id: I62a76cb248b1c0d1ffe22e085754a31a0c721a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-01 23:01:12 +00:00
Oswald Buddenhagen
16249a5fce Adjust submodule branches
Change-Id: I1aafb2a8b674fabaefeee711cb15d0e959849be5
2017-11-01 13:58:30 +01:00
Qt Submodule Update Bot
4b73d4a666 Update submodules on '5.9' in qt5
Change-Id: I72963749ae7d3756933c0a561f06fc90adc59dc8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-30 06:01:34 +00:00
Joni Jäntti
f90790b3ed MinGW provisioning to 64-bit from 32-bit
We are switching to 64-bit MinGW targets in 5.11 branch.

Task-number: QTQAINFRA-1432
Change-Id: Ic806e0e6400ae98351a922ed7f5a545046273ada
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-28 19:11:21 +00:00
Liang Qi
dc66b1f7e1 Update submodules on 'dev' in qt5
Change-Id: I59501a4a693f7979b129ff6f8e19d62b5da34e16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 19:11:18 +00:00
Tony Sarajärvi
583e196784 Cleanup of opengl32.dll replacement
This one isn't needed as the vanilla OS already contains
the original file.

Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:44 +00:00
Tony Sarajärvi
185eb5b414 Cleanup of provisioning scripts as tier1 images are vanilla
Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:41 +00:00
Qt Submodule Update Bot
81f832f0a6 Update submodules on '5.9' in qt5
Change-Id: Id803fd815a34d0adad0e3c02cb4373b78e9a9eab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 18:40:38 +00:00
Liang Qi
59cd433253 Update qtwebengine only
Change-Id: I8ab878c59ab56004a7293f85a4014c274dd93b06
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.10.0-beta3
2017-10-28 06:15:21 +00:00
Qt Submodule Update Bot
d18655ef5a Update submodules on '5.10' in qt5
Change-Id: I59f1102e56c9882ad9d5c89b026c33bdcf885a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-27 13:07:10 +00:00
Jani Heikkinen
72cc047726 Fix QNX platform configurations for Qt 5.9
With Qt 5.9 series we still deliver binaries for QNX 6.6 only ->
  - Add QNX 6.6 platform configurations for windows
  - Remove 'packaging' flag from QNX 7.0 builds
  - Add provisioning script to patch QNX in windows 10 as well

This change fixes the previous 5.6 merge, where this should've happened.

Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-27 03:18:00 +00:00
Qt Submodule Update Bot
1376f16f3b Update submodules on '5.9' in qt5
Change-Id: I903ba51634aa67a83e980c125ccc7d063e12ca73
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-25 12:37:49 +00:00
Qt Submodule Update Bot
081ee56cd0 Update submodules on 'dev' in qt5
Change-Id: Ic3774c799e0fde95edd02076fe33da9accf19ee0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 16:54:49 +00:00
Qt Submodule Update Bot
1b798a59a3 Update submodules on '5.9' in qt5
Change-Id: Ica9109b0b5868ccc60043b5c861e853837bd9213
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 12:53:33 +00:00
Tony Sarajärvi
372d2bb076 Provision vanilla Windows 7 x86 and use it
Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-24 12:53:26 +00:00
Qt Submodule Update Bot
88a5b96c50 Update submodules on '5.10' in qt5
Change-Id: I50fde887007ad394e276749b1ce354008eeb8aff
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 04:59:15 +00:00
Joni Jäntti
3b7b924b31 Fix Windows 10 x64 Python with new tier 1
Current tier 1 template #9 has python and anaconda installed that came
with MSVC2017. This messes with the provisioning scripts and ultimately
builds such as pyside, even though qt5 builds go through.

Task-number: QTQAINFRA-1503
Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-23 17:37:10 +00:00
Allan Sandfeld Jensen
f129af9f81 Add mozilla-nss-devel to opensuse
QtWebEngine now depends hard on NSS as the OpenSSL backend never worked
well on Linux.

Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-22 12:17:33 +00:00
Liang Qi
6cbd3faac0 Update submodules on 'dev' in qt5
Change-Id: I6854bd7c7219a6d9cf86ff3566bea966ae2771b1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-21 06:57:56 +00:00
Liang Qi
22a2a8a6b9 Update submodules on '5.10' in qt5
Change-Id: I78d5aa1f7b2ecaecf31c4458b2d489633cf7bc17
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-20 13:50:03 +00:00
Liang Qi
c41dd34de7 Update submodules on '5.10' in qt5
Change-Id: I550202469e06a974a942fbc7f207a09236f84a7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.10.0-beta2
2017-10-19 11:39:19 +00:00
Tony Sarajärvi
5f76910476 Provision ICC to openSUSE 42.3
Task-number: QTQAINFRA-1196
Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-19 09:28:47 +00:00
Joni Jäntti
357202801f Make CI use a new RHEL 7.4 provisioning
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5.

This commit replaces RHEL 7.2 in desktop builds, android builds
and INTEGRITY builds.

Task-number: QTQAINFRA-1251
Task-number: QTQAINFRA-1252
Task-number: QTQAINFRA-1253
Task-number: QTQAINFRA-1267
Task-number: QTQAINFRA-1269
Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-19 09:28:44 +00:00
Qt Submodule Update Bot
5c7ccdbc83 Update submodules on '5.9' in qt5
Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 09:28:36 +00:00
Tony Sarajärvi
128075f744 Fix typo in echoing version to versions.txt
Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:17 +00:00
Joni Jäntti
4cdfd8e902 Make 7zip provisioning script add 7zip to path
7zip is nice to have in path for future purposes such as when
cherry-picking to other branches where we use different
extracts scripts.

Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:15 +00:00
Joni Jäntti
e8fc216658 Make Extract-7zip helper function work with the new provision location
Changed the helper function for extracting 7z files so that it also
supports the new C:\Utils\sevenzip location.

Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-17 16:57:12 +00:00
Joni Jäntti
e09dc71d25 Make Ninja provisioning use Add-Path function
We should use this helper function now that we have it.

Change-Id: I9a522533795d4d4e63f608a0624378f066055b10
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:09 +00:00
Joni Jäntti
a26ce5e56a Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 10 template.

Task-number: QTQAINFRA-1263
Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:07 +00:00
Qt Submodule Update Bot
a1958e911c Update submodules on '5.9' in qt5
Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-14 05:37:19 +00:00
Liang Qi
f63fc8ca25 Merge remote-tracking branch 'origin/5.9.2' into 5.9
Conflicts:
	.gitmodules

Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce
2017-10-11 10:31:05 +02:00
Qt Submodule Update Bot
388747cb1a Update submodules on '5.9' in qt5
Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-10-11 07:51:10 +00:00
Liang Qi
ef983c6a3b Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev 2017-10-05 17:50:40 +00:00
Jędrzej Nowacki
ee8327928d Provision 32 bit libclang on all Windowses
Up to now we were always matching host architecture for
clang version to install. It is not good enough as in
some cases (all?) we build qdoc, which depends on clang,
as 32 bit app, that can not link to 64 bit clang.

Change-Id: I7b635f38821533da32d721e5e55f0067d4d0f62e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 17:50:37 +00:00
Liang Qi
1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
2017-10-05 12:47:24 +02:00
Liang Qi
cdab32be23 Update submodules on 'dev' in qt5
Change-Id: I309c7e0fffbcd8b18c9bacf1587bd247687d9c95
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-05 07:12:25 +00:00
Qt Submodule Update Bot
9a096e6841 Update submodules on '5.10' in qt5
Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.10.0-beta1
2017-10-05 06:54:38 +00:00
Qt Submodule Update Bot
ae9f6019bc Update submodules on '5.10' in qt5
Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-04 06:36:18 +00:00
Qt Submodule Update Bot
26ba2cdc5d Update submodules on '5.9.2' in qt5
Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.9.2
2017-10-03 14:03:55 +00:00
Qt Submodule Update Bot
b37ff601f5 Update submodules on '5.9.2' in qt5
Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-10-02 18:13:31 +00:00
Qt Submodule Update Bot
cf0a8af55d Update submodules on '5.10' in qt5
Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-02 08:29:12 +00:00
Qt Submodule Update Bot
35a3ba35ef Update submodules on '5.10' in qt5
Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-01 09:02:32 +00:00
Tony Sarajärvi
2a650c49ee Provisioning: Fix usage of DownloadURL to throw errors
In case DownloadURL failed it's shasum check, it printed an error
and threw an exit 1. This exit 1 was never handled in the calling
scripts and went ignored. It was also not passed forward as
it was inside a try-catch statement.

Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-30 12:21:16 +00:00
Tony Sarajärvi
cda49ad060 Remove duplicate MinGW 5.3 provisioning
Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-30 12:21:01 +00:00
Tony Sarajärvi
8a93a8fe6a Provisioning: cleanup path from cmake_linux.sh
Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-30 12:20:39 +00:00