Commit Graph

1530 Commits

Author SHA1 Message Date
Liang Qi
9be869ba48 Merge remote-tracking branch 'origin/5.6' into 5.8
Task-number: QTBUG-58371
Change-Id: Ic3ec10a04ec9fcfea38324f6052b2d082c6ece58
2017-01-28 12:21:28 +01:00
Heikki Halmet
d4681ee690 Android sdk and ndk to provisioning for Windows 7
Installs latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.

Task-number: QTBUG-58369
Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-28 03:57:41 +00:00
Liang Qi
98fa30e28e Update submodules on '5.8' in qt5
Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-28 03:56:27 +00:00
Liang Qi
0874dba009 Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
2017-01-26 15:54:16 +01:00
Liang Qi
18967fce7d Update submodules on '5.8' in qt5
Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-26 00:13:35 +00:00
Heikki Halmet
3276f075b9 Provision: Set bash_profile to read .bashrc
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.

This brings the behavior of the system closer to what we see as
developers.

However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.

On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.

For consistency we apply the same logic to the macOS configurations.

Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:27 +00:00
Heikki Halmet
eeea4e5c3a Add Android NDK/SDK to provision for macOS 10.10 and 10.11
Install latest Android sdk and ndk.
It also runs update for SDK API level 18

Task-number: QTBUG-58370
Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:24 +00:00
Liang Qi
84ed87b496 Update submodules on '5.8' in qt5
Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-24 09:40:15 +00:00
Liang Qi
1a3ff2b1af Update submodules on '5.8' in qt5
Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-22 11:15:48 +00:00
Liang Qi
07cc7ef71a Update submodules on '5.6' in qt5
Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-01-22 10:28:45 +00:00
Liang Qi
3e4f86d652 Update submodules on '5.8' in qt5
Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-19 16:10:16 +00:00
Qt Submodule Update Bot
ee19f88fe0 Update submodules on '5.8.0' in qt5
Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.8.0
2017-01-19 13:09:05 +00:00
Oswald Buddenhagen
e74b0f7df4 Merge remote-tracking branch 'origin/5.8' into 5.8.0
This pulls in the CI build configurations.

These files were previously stored in the CI source tree, but they do belong
here. They describe the different configurations under which we want to build
Qt and its submodules, in terms of underlying virtual machine template, host
OS, target OS and CI related features that may also map to Qt configuration
features.

Task-number: QTQAINFRA-1074
Started-by: Simon Hausmann <simon.hausmann@qt.io>
Change-Id: I8ab9b987a28566ad036dcaf8f0663bd633fea439
2017-01-18 10:49:22 +01:00
Liang Qi
43c9b16100 Update submodules on '5.6' in qt5
Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-17 05:29:11 +00:00
Liang Qi
b336c10c08 Update submodules on '5.8' in qt5
Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-16 11:41:13 +00:00
Liang Qi
1ba2e08637 Update submodules on '5.8' in qt5
Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-14 08:01:20 +00:00
Qt Submodule Update Bot
63d77a0b28 Update submodules on '5.8.0' in qt5
Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-01-14 07:32:35 +00:00
Simon Hausmann
9de5f6957c Merge remote-tracking branch 'origin/5.7' into 5.8
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
2017-01-12 22:19:30 +01:00
Liang Qi
7b17d411f1 Update submodules on '5.8' in qt5
Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-12 16:47:52 +00:00
Liang Qi
d0bbf98cc9 Update submodules on '5.6' in qt5
Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-01-12 05:58:01 +00:00
Simon Hausmann
0f4fdb9490 Merge remote-tracking branch 'origin/5.6' into 5.7
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Simon Hausmann
3035f20934 Add CI build configurations
These files were previously stored in the CI source tree, but they do
belong here. They describe the different configurations under which we
want to build Qt and its submodules, in terms of underlying virtual
machine template, host OS, target OS and CI related features that may
also map to Qt configuration features.

Task-number: QTQAINFRA-1074
Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-11 13:57:45 +00:00
Liang Qi
4b6bff8044 Update submodules on '5.8' in qt5
Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-11 12:22:47 +00:00
Heikki Halmet
2cf8327999 Provision: Cmake 3.6.2
Red Hat 6.6 needs cmake for GammaRay
OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside

Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:59 +00:00
Tony Sarajärvi
8266919b6e Add provision helper file to install compressed packages
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:50 +00:00
Tony Sarajarvi
2059ce3d2d Add DownloadURL.sh provisioning helper script
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:40 +00:00
Tony Sarajarvi
da48107b08 Add provisioning try-catch helper script for bash
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:21 +00:00
Liang Qi
96a8c36ee8 Update submodules on '5.8' in qt5
Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-10 18:31:37 +00:00
Simon Hausmann
5f40fd649e Improve build performance on Windows
Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.

Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-09 13:37:16 +00:00
Qt Submodule Update Bot
4cdbf1893f Update submodules on '5.8.0' in qt5
Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-01-09 11:15:26 +00:00
Simon Hausmann
ab9b902f3f Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Id9533b63ae2e6d67d8c07101c406c40057c13b9f
2017-01-08 21:12:18 +01:00
Tony Sarajärvi
17c97ea79a Add provision helper file to install compressed packages
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:50 +00:00
Tony Sarajarvi
2b2188cc77 Add DownloadURL.sh provisioning helper script
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:39 +00:00
Tony Sarajarvi
c5e6abcafa Add provisioning try-catch helper script for bash
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:32 +00:00
Qt Submodule Update Bot
e47e40eb1c Update submodules on '5.8.0' in qt5
Change-Id: If96f0ff600589f565235c471fa3380bbe9848914
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-07 08:07:10 +00:00
Simon Hausmann
15e1dc2054 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Simo Fält
167e4fc36f Provisioning: Disable Windows Defender
This will reduct the timeouts coin has had recently with win machines.

Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-06 12:15:36 +00:00
Qt Submodule Update Bot
40addc7d81 Update submodules on '5.8.0' in qt5
Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-01-03 15:26:13 +00:00
Simon Hausmann
26775d4e3e Merge remote-tracking branch 'origin/5.8' into 5.8.0
This brings in the Android OpenSSL fixes to allow the use of newer TLS
versions with Qt, the conan manifest updates to allow for provisioning
to work as well as a few other fixes from the stable branches.

Change-Id: If2e4a1b8a4c8e44cd8d9b8918a3083cbaf1b385c
2017-01-02 09:43:07 +01:00
Simon Hausmann
ffa5fe8b2f Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I49d18025acb322bf45b6cdc38adb05618cb90153
2016-12-25 18:12:11 +00:00
Liang Qi
7cfb602367 Update submodules on '5.8' in qt5
Change-Id: I496fe34b7f81ae099fdb0733f87268ed805df992
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-25 10:59:20 +00:00
Konstantin Tokarev
678fcb4e66 Updated conan manifests after modification of packages
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-24 07:32:20 +00:00
Simon Hausmann
591c6d0446 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/common/02-python.ps1

Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
2016-12-21 21:38:29 +01:00
Simon Hausmann
8a60455e61 Remove shutdown "helpers" for macOS
It turns out that they don't quite work the way we expected them to, and
instead we Coin is going to shut down the VMs directly at the right
time.

Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-21 11:32:28 +00:00
Qt Submodule Update Bot
10c4c43e52 Update submodules on '5.8.0' in qt5
Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.8.0-rc1
2016-12-20 09:19:36 +00:00
Simo Fält
ff1ad70a19 Provision: Install pyside python dependencies to Windows
To test successfully pyside dependencies with Coin, we need
python virtual env.

Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-19 21:39:35 +00:00
Simo Fält
fc6717cf23 Provision: Install pyside python dependencies to Linux
To test successfully pyside dependencies with Coin, we need
python-dev packages and virtual env.

Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-19 21:39:26 +00:00
Qt Submodule Update Bot
2c9249195d Update submodules on '5.8.0' in qt5
Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2016-12-19 08:56:44 +00:00
Qt Submodule Update Bot
5664df0625 Update submodules on '5.8.0' in qt5
Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-17 07:31:37 +00:00
Qt Submodule Update Bot
6c15dc0302 Update submodules on '5.8.0' in qt5
Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-16 19:55:39 +00:00