Commit Graph

1058 Commits

Author SHA1 Message Date
Leander Beernaert
31d83f1ddb Update submodules and disable some failing repositories
Until dev is fixed, we disable some of the broken repos in the qt5
wip/cmake branch: qttools, qtremoteobjects, qtscxml, qtwebsockets,
qtwinextras.

Also switch Windows to be built in Release mode, to circumvent some
issues with Debug builds that are also present in dev. Note qmake
builds in Coin also only build Release builds of Windows for testing.

Change-Id: Ie095fa16920fb6bd92db80118abeb6b282c96897
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-01-27 08:22:18 +00:00
Alexandru Croitor
94f9d3e7da Add a macOS non-framework build to Coin
Keep it for now, so we don't introduce breakages there now that the
framework build is the default config. Make it a developer build.

Change-Id: Ib92bd4935937a7965630837ce7de369a0340fd9f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-16 09:40:46 +00:00
Alexandru Croitor
0a3a855774 Build an iOS configuration in Coin
Install ninja from homebrew.

Provision freetype and pcre2 for host builds, like in the
macOS 10.13 case.

Provision homebrew gcc 9 to build vcpkg.
We can't use Xcode 11 clang to build vcpkg, because std::filesystem
is only implemented for macOS 10.15, so the deployment target needs
to be 10.15, and we don't have any 10.15 VMs currently.
Whereas the std::filesystem implementation provided by gcc can work
on lower macOS versions.

When building vcpkg using the Xcode default provided system headers,
the build will fail with the following error:

stdio.h:222:7: error: conflicting declaration of 'char* ctermid(char*)'
with 'C' linkage

_ctermid.h:26:10: note: previous declaration with 'C++' linkage

The Xcode SDK is missing some C++ headers. Usually these are
installed manually via an additional step like the one below,
but only after installing the command line tools.

sudo installer -pkg
/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
-target /

Apparently not all command line tool packages ship this extra header
package, so instead switch the active toolchain to the CLT via
xcode-select -p, which seems to always have the necessary headers
(at least from my testing).

That's why we use the CLT for vcpkg.

Bootstrap vcpkg, and install the iOS 3rd party packages using vcpkg.

Finally add a configuration to build qtbase targeting iOS.

Task-number: QTBUG-75576
Change-Id: Idec885d62b12f96c4830b9ec02b63a89b9cc7b8c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-12-17 20:45:05 +00:00
Alexandru Croitor
3aef268464 Update vcpkg snapshot
The snapshot uses the previous snapshot as a based. It was rebased
on latest master as of 2019-12-05, and also contains cherry-picked
patches to target iOS.

Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:58:03 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
2019-11-28 19:44:30 +01:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
2019-11-22 17:26:28 +01:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Heikki Halmet
dcfef7226f Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 08:08:10 +02:00
Heikki Halmet
0335e9c4e5 Provisioning: Remove shell scripts under windows
Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 09:08:04 +03:00
Heikki Halmet
601a9d39b2 Provisioning: Install python modules needed by packaging
Needed by packaging scripts

Task-number: COIN-214
Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-11-20 08:07:58 +02:00
Liang Qi
6d7ae7ebe1 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/common/linux/docker.sh

Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
2019-11-18 19:21:53 +01:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-11-18 14:23:08 +02:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-15 06:22:55 +02:00
Tor Arne Vestbø
6bf7a970e7 Use Xcode 11 on macOS 10.14
Fixes: QTQAINFRA-3261
Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:04:33 +00:00
Tor Arne Vestbø
40cca42c39 Use macOS 10.14 to build iOS/tvOS/watchOS
Allows us to (as a follow-up) use Xcode 11.

Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:08:00 +01:00
Dimitrios Apostolou
ef7481b9cd Workaround broken local apt mirror
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:22 +01:00
Dimitrios Apostolou
33d2547817 Keep debug trace off to avoid polluting the logs
Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:20 +01:00
Dimitrios Apostolou
a270bcdb6b Docker installation: do not depend on external repositories
Also updated the docker-compose binary to the latest one.

Task-number: QTQAINFRA-3279
Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:18 +01:00
Dimitrios Apostolou
fafd3d655d Fix cache URL for telegraf windows package
Fixes: QTQAINFRA-3340
Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-14 08:46:16 +01:00
Dimitrios Apostolou
6cc2215b8c DownloadURL last argument (targetFile) is now optional
Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:14 +01:00
Simon Hausmann
1aa25c1084 Bump vcpkg to a new snapshot
Some patches were upstreamed and this beings the version in line with
what we need for Android. This patch also centralizes the version into a
shared file, for future use.

Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-13 09:57:53 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-12 13:27:23 +00:00
Heikki Halmet
569fd1dabc Provisioning: Install pre-builded openssl for Windows 7
Task-number: QTQAINFRA-3224
Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-12 07:09:49 +02:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
2019-11-11 10:52:16 +01:00
Liang Qi
ae27f21d26 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml

Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
2019-11-08 09:10:04 +01:00
Heikki Halmet
f1276acf5c Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version
Under coin/pre-provisioning can be found information what have been
provisioned to tier1 image

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-07 21:59:25 +02:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
2019-11-07 08:08:49 +01:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
2019-11-06 14:19:45 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-05 13:56:46 +00:00
Matti Paaso
f178318d2f Add new target for installer framework
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-11-04 14:46:22 +02:00
Heikki Halmet
39a42f0abd Provisioning: Hide password with /dev/null
Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:50 +03:00
Heikki Halmet
8bdabd9901 Provisioning: Remove Red Hat 6.6 from provisioning
Task-number: QTQAINFRA-3260
Change-Id: If6078a36e9ab7730cacb81a9c417c87455db89cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:41 +03:00
Heikki Halmet
52fe759eba Provisioning: Upgrade OpenSSL version to 1.1.1d
Plus removing unused file install_openssl_111a.sh

Task-number: QTQAINFRA-3224
Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:33 +03:00
Heikki Halmet
5b752460bc Provisioning: Update Xcode package for macOS 10.14
Apple's certification was expired so Xcode 10.2.1 package needs to be
updated from the Apple's download server. Old one causing problems with
RTA tests.

Task-number: QTQAINFRA-3317
Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 18:41:24 +02:00
Tony Sarajärvi
2eab420e80 Remove more of update notifiers
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Tony Sarajärvi
5b77e74a5e Change local Ubuntu repo mirror in provisioning
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Jani Heikkinen
464c4c8147 Drop unnecessary android builds
From 5.14 -> we will have combined android builds for all android
targets. So remove all separate android builds as those are covered by
multi ones.

Task-number: QTQAINFRA-3310
Change-Id: Ia00222cf56e85ed207ad01d5d00a81849196176d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-29 19:46:26 +00:00
Heikki Halmet
eb0ef419ec Add allowUntrusted parameter for command line tools and refresh Xcode
Apple has signed their packages with certificate which has been
expired 24.11.2019. Packages are unusable without allowUntrusted
parameter

Also Xcode package for macOS10.13 needs to be refetched from
Apple's download to local cache

Task-number: QTQAINFRA-3317
Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-29 19:37:09 +02:00
Tony Sarajärvi
d406ff6398 Build examples on the no-widgets builds
Task-number: QTQAINFRA-1975
Task-number: QTBUG-63908
Change-Id: I0279fd4ca58ab389855e1152e9a8cee3ac97d502
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:11:07 +00:00
Tony Sarajärvi
17550319e5 Provision gnuwin32's path
By provisioning the path to gnuwin32, we can remove the
hard coded paths from Coin.

Task-number: QTBUG-73422
Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:10:50 +00:00
Heikki Halmet
60befd7508 Provisioning: Disable automatic cleanup from windows
Task-number: QTQAINFRA-3238
Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-18 13:53:05 +03:00
Simon Hausmann
33d9eb2b99 Work around cmake issue breaking C++ feature detection on Android
As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version
of CMake we're currently using in the CI has an issue detecting clang as
GNU compatible C++ frontend and thus fails to convert the values in the
CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around
this for now as suggested in the upstream ticket. We can remove this
when upgrading to a newer cmake version.

Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-17 15:15:09 +00:00
Samuli Piippo
2b58935efd QNX: Use extprefix for the host path
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x

Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2019-10-16 10:02:09 +03:00
Dimitrios Apostolou
72111504ea Update epel package to latest version
The online repo only contains the latest version.

Change-Id: I2dfbc3c2a873ed3758672682b09c0205bfa19549
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:05 +02:00
Dimitrios Apostolou
518e114dc7 Fix for DownloadURL to try alternative URL
Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:04 +02:00
Dimitrios Apostolou
482552d813 First try cached URL before hitting the official repo
Change-Id: Id0cf89090155459fd660d55ce427cd34bf3136f5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:02 +02:00
Dimitrios Apostolou
c6a9b3cd68 Update previously committed patch to match the branch's platforms
Task-number: QTQAINFRA-3092
Change-Id: I598759f0624e478a07cfe3256cbeba2f2b8bfe02
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-15 12:41:00 +02:00
Toni Saario
9ee61892d0 Add platform_configurations for StaticHostOnly targets
Configuring modules in specific files removes their dependency for
coin creating their configurations.

Task-number: COIN-259
Task-number: QTBUG-78942
Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-10-15 13:40:58 +03:00
Heikki Halmet
3f9673d109 Provisioning: Update Cmake to version 3.7.2
QtCreator requires Cmake minimal version to be at least 3.7.0

Task-number: QTQAINFRA-3272
Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-15 13:40:55 +03:00