Commit Graph

67 Commits

Author SHA1 Message Date
Tony Sarajärvi
b85b272c26 Move MSVC2017 x86 builds to 64bit host OS
Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:40 +00:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
2018-01-12 21:13:56 +01:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00
Tony Sarajärvi
7a37b90702 Drop builds done with VS2013
Task-number: QTQAINFRA-1390
Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 20:43:53 +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
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
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
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
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
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
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
Liang Qi
7d04dc1a29 Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.

Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:59 +00:00
Tony Sarajärvi
92a7d95947 Fix indentation in platform configurations
Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-30 05:00:39 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01: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
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
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
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
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
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
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
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
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
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
Tony Sarajärvi
0dbc2a3aaf Add QNX7 as a build target on macOS 10.12 hosts
Task-number: QTQAINFRA-1189
Change-Id: Ica11a1ca1dc7b306da243f719ff48dce4d03d271
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-01 19:24:04 +00:00
Joni Jäntti
30660bf987 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: Ieeb2ae3c53841644996d99ca86228df6f825a63a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-09-01 08:05:54 +00:00
Timo Aarnipuro
8007941af0 Enable INTEGRITY coin builds
Task-number: QTBUG-61702
Change-Id: If5f10aafc6d2c0853fbc3039aa7368620e04ea20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 13:55:01 +00:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Liang Qi
74eb853384 Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.

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

Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
2017-08-22 08:22:02 +02:00
Joni Jäntti
bd3ddeddd2 Make CI use a new win 8.1 provisioning instead of win 8
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 8 template.

Made all the Windows platforms use the scripts under
provisioning/common/ instead of duplicate files.

Task-number: QTQAINFRA-1357
Change-Id: Ic3f0b50079b212437fff711379f243753ab84872
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-11 16:49:10 +00:00
Paolo Angelelli
74fa40d978 Replace QNX7 target with QNX6.6 for all Qt modules
Reason being that it's much easier to trigger compile errors with the
QNX6.6 toolchain than with the newer QNX7, so these show up at once
and not only at qt5.git integration.

Task-number: QTBUG-62047
Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 14:11:29 +00:00
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Friedemann Kleint
1bdbe06c82 MSVC: Run tests with MSVC2017 instead of MSVC2013
It appears tests compiled with MSVC2013/64bit are prone to
crashes. Keep only a developer build/compile test in default.txt
and move the packacking builds to qt5.txt with tests disabled.
Enable testing with MSVC2017 builds in qt5.txt.

Task-number: QTBUG-58654
Task-number: QTBUG-50835
Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-11 03:30:44 +00:00
Simon Hausmann
20113e4872 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
2017-06-12 21:36:03 +02:00
Friedemann Kleint
eb58b173e1 Enforce MinGW developer build
MinGW is very sensitive to inlining / export errors, so having a
developer build check is valuable. Add a MinGW developer build
executing tests to increase coverage and turn off testing for the
packaging build in return.

Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:13 +00:00
Simon Hausmann
0358b6d28c Remove QNX Windows builds
We can't get those to work with the faster KVM based VMs, so disable
these builds for the time being.

Task-number: QTQAINFRA-1208
Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-07 18:10:08 +00:00
Jani Heikkinen
5be9b3d2be Add missing ForceDebugInfo -flag for winRT x86_64 builds
Task-number: QTQAINFRA-1233
Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-06-04 19:55:21 +00:00
Heikki Halmet
d514585213 Enable WinRT builds for MSVC 2017
All 2017 configurations are added to qt5.txt for now.

Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-05-11 12:16:23 +00:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Jake Petroules
d48b0c3402 Remove Static from the tvOS configuration
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.

Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-06 09:18:10 +00:00
Jake Petroules
dfb0befca3 Remove Static from the watchOS configuration
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.

Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 06:12:36 +00:00
Heikki Halmet
a4a7f71f37 MSVC 2017 updated and missing component for winrt arm
MSVC 2017 and Build Tools updated to version 15.1. Also missing
component 'Visual C++ compilers and libraries for ARM' installed
for winrt arm

Also script added to storage msvc version numbers to versions.txt

Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-03 09:51:17 +00:00
Simon Hausmann
4ee0e8fb46 Fix tier1 template selection for QNX 7 builds on Windows
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b with the tier1 update
from commit 070d9333a6.

Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-05-02 17:16:22 +00:00
Heikki Halmet
385ecebe80 Platform Configurations for Visual Studio 2017
MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build
tools. When winrt arm is available for msvc 2017 in qtbase it will
be added to platform configurations also

Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-02 17:16:19 +00:00