Commit Graph

1470 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Liang Qi
1cfc052b9d Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Joni Jäntti
0e4d668e35 Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.

Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-27 06:04:11 +00:00
Simo Fält
0b251bbdc0 Provisioning: Install Python3 development libs to OpenSUSE
Those are required to build Pyside#5.9 branch.

Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-26 07:30:25 +00:00
Heikki Halmet
512f8ff0a2 Change Packaging and iOS builds to macOS 10.12
This changes swap packaging and iOS builds
from 10.10 to 10.12

Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-25 09:10:31 +00:00
Liang Qi
892b1977c5 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Maurice Kalinowski
b77ab20bf0 Provisioning: Update MQTT provisioning
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.

Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-23 05:48:44 +00:00
Liang Qi
04ccf0e8db Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
2017-09-22 21:15:52 +02:00
Joni Jäntti
0c66e761be provisioning: Windows 10 x64/x86 Vulkan SDK
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.

Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-09-19 06:39:31 +00:00
Simon Hausmann
356b20feed Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Liang Qi
e7472f4308 Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
	.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
2017-09-18 09:42:25 +02:00
Simon Hausmann
57043fb07b Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.

Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-16 05:35:10 +00:00
Simon Hausmann
b7d9431716 Fix python installation on OpenSuSE 42.3
The move was forgotten in commit
dd3d32d13c that merged the 42.1 to 42.3
switch from the 5.9 branch.

Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-16 05:17:48 +00:00
Heikki Halmet
12fd0d5b9b Ensure 'clean' android Installation
Remove old android installation and make sure new 'clean' android
folder is created.

Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-15 10:38:24 +00:00
Maurice Kalinowski
fd76acc661 Add mqtt to qtci-linux-openSUSE-42.3-x86_64
MQTT provisioning happened concurrently with an OpenSUSE update.

Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-14 15:04:30 +00:00
Tony Sarajärvi
b0a9259c6e Provision and build QNX660 on Win 10 x64
Changes the mingw from 4.9 to 5.3.

Task-number: QTQAINFRA-1208
Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:39 +00:00
Tony Sarajärvi
2a5f54d07e provisioning: install MinGW 530 and 630 for Win10 x64
MinGW is an alternative option for Visual Studio. It's
used to create desktop builds and for cross compiling
Android and QNX. At this point it is still unclear which
version is going to be used for what, but as both are
supported, let's think ahead and provide them both.
This also allows us to debug with the other, if the
other is causing problems.

Task-number: QTQAINFRA-1289
Change-Id: I2a922669c07d49370e608c093be80481c8613dc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-14 12:08:36 +00:00
Tony Sarajärvi
892833cda9 Provisioning: Invoke installer with Start-Process
By launching an installer with Start-Process and -Wait,
we make sure no handles are left holding on to the
installer when we try to delete it at cleanup.

Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-14 12:08:32 +00:00
Tony Sarajärvi
a9cf936a63 Provision: Move Python3 scripts from win8 to win8.1 folder
Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:28 +00:00
Simon Hausmann
b1c268a8eb Build examples also on Linux with namespaces
With this change we get coverage for namespace related build breakages
in examples of Linux-only modules, such as wayland.

Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-09-12 16:20:51 +00:00
Dominik Holland
528580bbcd Install python3 on all platforms
This forward-ports commit a99d3432f7
to 5.9, which should have been done in
6bf5691ca8 but accidentally left out.
It reuses parts of commit a5f3f8ed48
that was initially cherry-picked to 5.6.

Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-12 13:59:10 +00:00
Jani Heikkinen
2ef18dac6c Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-10 11:16:26 +00:00
Maurice Kalinowski
a1f173fc67 Provisioning: Install paho mqtt broker
The paho broker is used for testing the Qt Mqtt module, specifically the
client classes.

Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-10 11:16:15 +00:00
Simo Fält
92d1bdcb43 Provisioning: Fix shasum path
Commit c48355ebb5 changed
the path of shasum, which was not intended. While the
DownloadURL.sh utility is used by rhel in addition to
macOS we can't rely on /usr/bin/shasum but we have to
use the one found from PATH.

Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-08 04:34:41 +00:00
Simon Hausmann
dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
8852587991 Provision openSUSE 42.3 and add to CI
Replaces 42.1 that isn't supported anymore by
openSUSE.org.

Task-number: QTQAINFRA-1257
Task-number: QTQAINFRA-1259
Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-06 06:13:06 +00:00
Tony Sarajärvi
cc8a7501f3 Swap B2Qt branch to Pyro
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-09-05 15:15:59 +00:00
Konstantin Tokarev
6dfd0c7b38 Use 64-bit host for VS2017 builds of QtWebKit
Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-09-05 13:46:17 +00:00
Simo Fält
c48355ebb5 Provisioning: Fix DownloadURL utility's shasum check
MacOS 10.10 has older shasum tool, which does not support oneliner
verification.

Change-Id: If00b846d5772aa1991960675d022249d63e7bd77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 11:36:43 +00:00
Simo Fält
a3f4bf703b Provisioning: Fix helper function's mktemp in macOS 10.10
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.

Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-04 14:23:05 +00:00
Tony Sarajärvi
a7b1b00350 Provisioning: Hide powershell progress bar for performance
Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-04 12:12:17 +00:00
Joni Jäntti
dbf737a5c0 Fix Add-Path helper function and start using it in scripts
This function was broken and only added the latest addition to the
actual PATH.

Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-04 12:11:17 +00:00
Akseli Salovaara
4e1f4665c5 Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries
requires Windows 64bit machine. Linking requires more RAM than
Windows 32bit can address. Change MSVC2013 & MSVC2015
integration host machines accordingly.

Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-04 07:10:14 +00:00
Aapo Keskimolo
42b502f7bc Add UploadConfigureExe feature
We used to solve the requirement for uploading configure.exe from
product version, but we can add this as a feature and remove the
dependency to product version.

Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-02 11:32:38 +00:00
Frederik Gladhorn
8c8be48167 Prefer apt-get over apt in scripts
apt explicitly warns that it doesn't have a stable UI, so it shouldn't
be used in scripts. This should have no implications in practice.

Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-02 05:48:25 +00:00