Commit Graph

2817 Commits

Author SHA1 Message Date
Joni Jantti
cec7c07283 Add set -ex to provisioning scripts for osx-10.10
Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:21 +00:00
Joni Jantti
b23faee265 Add set -ex to provisioning scripts for osx-10.11
Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:17 +00:00
Tony Sarajärvi
70d3800aab Remove provisioning of ICU for VS2012
Visual Studio 2012 isn't used in our builds.

Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:13 +00:00
Tony Sarajärvi
fb282b2e58 Provision fbx to RHEL 7.4 for 3DStudio
Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:08 +00:00
Tony Sarajärvi
1399d6e130 Add set -ex to provisioning scripts for RHEL 7.4
Task-number: QTQAINFRA-1659
Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:03 +00:00
Joni Jantti
66f9718ebb Provisioning: Clean and move Win8 mqtt scripts to Win8.1
mqtt scripts need to be moved to Windows 8.1 directory from Windows 8.

Change-Id: Idc1b116f608e8cc8ae0a37713661d35b55b26a3a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 11:29:37 +00:00
Joni Jantti
dc0d045c17 Provisioning: Move open62541 from RHEL 7.2 to RHEL 7.4
5.10 -> dev merge switched from RHEL 7.2 to 7.4 and the open62541
provisioning script was left behind to the RHEL 7.2 provisioning
directory.

Task-number: QTQAINFRA-1666
Change-Id: I5c325dae63cb14a9935ddce5f3f751bd62df0ba2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-12-27 11:29:35 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Qt Submodule Update Bot
2d71b84893 Update submodules on '5.9' in qt5
Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-24 00:57:34 +00:00
Liang Qi
1bba397539 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh

Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
2017-12-22 21:37:24 +01:00
Simo Fält
de0d7005cc Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5df4ec2ec9)
2017-12-22 15:22:27 +00:00
Oswald Buddenhagen
a0bf828433 Adjust submodule branches
Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
2017-12-22 12:57:22 +01:00
Tony Sarajärvi
88a1c161e5 Remove unneeded OS X provisioning scripts
Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-22 05:21:27 +00:00
Jani Heikkinen
21cbacf4b4 Remove 'Packaging' flag from builds we don't need it
We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit
so we don't need 'packaging' flag there either

Task-number: QTBUG-65324
Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-22 05:21:20 +00:00
Qt Submodule Update Bot
dd7f4112fd Update submodules on '5.9' in qt5
Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-22 05:21:14 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Simo Fält
5df4ec2ec9 Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: Ifae45ce36b5739cea5124eae04e08472ebe9414a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-21 16:55:09 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
6b7ee9a8f0 Update qtcanvas3d only
Task-number: QTBUG-64766
Change-Id: I2ae55f0f4e38ffb98964f960c323334a9049936f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:38 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
b5e287b93b Update submodules on 'dev' in qt5
Change-Id: Ia91b548e08a7d84f47116b79265618ff9d4d8005
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:58 +00:00
Simon Hausmann
d55baf5baf Simplify apt package installation and disable daily package maintenance
Instead of using aptdcon, we can continue to use apt-get to install the
software. We just need to make sure that the automatic update and
package upgrade services are disabled. This is generally desirable as we
do not want these kind of activities to occur in the background while
building or running tests.

This also fixes the broken package installation via regex, which apt-get
supports but aptdcon does not.

Revert "Fix Ubuntu 16.04 random provisioning fail"

This reverts commit 537ea17d14.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-12-20 06:38:30 +00:00
Qt Submodule Update Bot
41edaa5fb9 Update submodules on '5.9' in qt5
Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:26 +00:00
Qt Submodule Update Bot
a4adb7f7d6 Update submodules on '5.10' in qt5
Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-20 05:38:34 +00:00
Konstantin Tokarev
b3d3adc541 Add libxml2 and libxslt to RHEL 7 for QtWebKit
Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-19 22:10:34 +00:00
Qt Submodule Update Bot
2e75f02a3f Update submodules on '5.10' in qt5
Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-19 12:00:51 +00:00
Konstantin Tokarev
2ee0364139 Add GStreamer libraries to openSUSE for QtWebKit and QtMultimedia
Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-18 18:18:04 +00:00
Albert Astals Cid
04f8860d8c Install cups-devel in OpenSuse
This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch

Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-18 10:58:10 +00:00
Qt Submodule Update Bot
0ae61f0f4d Update submodules on '5.9' in qt5
Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-18 05:26:11 +00:00
Qt Submodule Update Bot
9236cd01a2 Update submodules on '5.10' in qt5
Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-16 07:19:34 +00:00
Tony Sarajärvi
ae6ea5349f Remove Windows 8 provisioning scripts
They are replaced by 8.1 scripts.

Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-15 11:03:06 +00:00
Konstantin Tokarev
f5dfdedb2d Add libxml2 and libxslt to openSUSE for QtWebKit
Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-15 11:03:03 +00:00
Tony Sarajärvi
547a0ded90 Provisioning: Update default compiler to GCC-7 in openSUSE 42.3
Task-number: QTQAINFRA-1258
Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-14 17:59:45 +00:00
Tony Sarajärvi
df7255ce44 Swap ICC builds to use system's SQLite library
Task-number: QTBUG-64650
Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-14 17:59:31 +00:00
Qt Submodule Update Bot
3bcc9a9181 Update submodules on '5.10' in qt5
Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-14 17:59:21 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Liang Qi
475fc2c2ad Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.gitmodules

Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
2017-12-13 23:28:56 +01:00
Heikki Halmet
b16eac13e6 Provisioning: Remove Android script from Red Hat 6.6
Android linux builds are run by Red Hat 7.4

Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:39 +00:00
Jani Heikkinen
b0b6b05b34 Add 'ForceDebugInfo' -flag to linux desktop binaries
Add 'ForceDebugInfo' for RHEL 7.4 as well

Task-number: QTBUG-3934
Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-12-13 19:41:28 +00:00
Joni Jantti
1dee4e9fca Fix broken and duplicate Ruby provisioning
Ruby is being installed twice on certain Windows platforms and the 32
bit versions of these don't have a working PATH addition.

Task-number: QTQAINFRA-1632
Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:24 +00:00
Qt Submodule Update Bot
0565e759c5 Update submodules on '5.9' in qt5
Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-13 19:41:24 +00:00
Heikki Halmet
d06d1081c0 Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit adcdf7b49f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 06:02:54 +00:00
Heikki Halmet
44eaaf374a Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: I2f9ce5a094ffe4d07e8bd138c0dcc150d0d916e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-12 16:51:39 +00:00
Liang Qi
c98db75188 Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: I01a6ee1ecfaabe56e585194ccfab3b25fbd89e8b
2017-12-11 12:31:12 +01:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Qt Submodule Update Bot
e067ea2a72 Update submodules on '5.9' in qt5
Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-11 05:46:41 +00:00
Allan Sandfeld Jensen
35db81f33e Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry-picked from 9a9d798ce4)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-12-10 12:56:35 +00:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00