Commit Graph

595 Commits

Author SHA1 Message Date
Toni Saario
d1601aa0f9 Add conan to path
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 32579bc3c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:53 +00:00
Toni Saario
88b3474bcf Enable conan revisions mode
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3802e21afe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:47 +00:00
Toni Saario
1308663fd6 Update windows git version
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.

Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 7381cbeca8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-12 07:21:41 +00:00
Toni Saario
f5c5309067 Disable network LSO/TSO on linux and macOS VMs
LSO/TSO causes problems handling network packets and deteriorates the
network speed to below 1MB/s.

Task-number: QTQAINFRA-4241
Change-Id: Ib999035668eefe51d59715c9a18f42c9e3dfdf21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit db7926c715)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-11 20:21:19 +00:00
Heikki Halmet
42ee3f18fe Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 26c97222c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-04-11 15:57:09 +00:00
Johanna Äijälä
eb0962abdd Provisioning: update Squish packges
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.

Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 02d4c34b7d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-28 15:29:03 +00:00
Marianne Yrjänä
bb51a64003 Add QNX7.1 to CI
Task-number: QTQAINFRA-3768
Change-Id: I9c0aa78fad9c6a1263e75b06fa954c335f4b6ec2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 036729ed05)
2021-03-16 13:42:45 +00:00
Heikki Halmet
a41f41590b Change GCC version to 8.3.0 for Ubuntu 18.04
We need to use gcc 8 instead of 9 so that the Qt installer
will work with CentOS 8.3 which have gcc 8 in the system.
If we use newer gcc version with the binaries there will be issues
with libstdc++.
Using gcc-toolset-9 in CentOS won't help either because it will link
libstdc++ against the one in system.

Task-number: QTBUG-91352
Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 8843f51866)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-03 17:03:35 +00:00
Cristian Adam
4e3b53f228 Update QDoc libclang to 11.0
Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit d3406fedd1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-05 21:12:54 +00:00
Johanna Äijälä
d86303a561 Provisioning: Update Squish for Qt6
These are snapshot packages from Froglogic, not available for macOS yet,
thus it will still use Qt5.15 based Squish. Only Linux and Win packages
are updated now.
Along with the Squish for Qt6 we need the Squish for Qt5 to be able to
run Creator tests (since Creator is still Qt5 based).

Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5
Pick-to: 6.0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-02 07:38:13 +02:00
Heikki Halmet
e67fa087db Provisioning: Install Conan package manager
Conan package manager is need for addtional libraries

Task-number: QTQAINFRA-4190
Change-Id: I5cb07a137505f15d536989c6d5127f607735a17e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-26 14:15:15 +02:00
Heikki Halmet
6d20944daf Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-24 22:44:24 +02:00
Heikki Halmet
f6b0b21ba2 Add Big Sur macOS 11.0 to CI
Only one target is added because current HW capasity is minor.

Task-number: QTQAINFRA-3967
Change-Id: Iae2ac0e02b38b45a219a78e046fb21338ff9cd97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-22 10:35:11 +02:00
Heikki Halmet
8c32c1dcd7 Provisioning: Add libclang packages to cache
Both static and dynamic libclang packages are missing from our local
cache. Dynamic and static packages need to be in different folders
because package names are identicals

Pick-to: 6.0
Pick-to: 5.15
Change-Id: I0d4c0c776f1c5f318417cae6c16d683b31a10710
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-21 08:47:49 +02:00
Heikki Halmet
25dbd78d3f Provisioning: Use prebuilt Android openssl if available
Android openssl configuration is flaky. Some cases it can't find perl.
Let's use prebuilt package from local cache. If not available then
download sources and configure it.

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3993
Change-Id: I4b15cba763d88d85dfe7908fa22c2ce5f461f5cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-15 13:40:46 +02:00
Antti Jaakkola
68a183324d Use Parallels for macOS 10.15 builds and tests
Pick-to: 5.15
Pick-to: 6.0
Change-Id: I875cf12afafae5389f8c974cd40789c5183d4cb2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-12-31 06:08:19 +00:00
Toni Saario
dddb69b6eb Update sccache to 0.2.14
This makes windows binaries available from remote url and brings
some fixes to the sccache itself.

Change-Id: Ie108cbef783dbd4d7665964cdc00f0b05b062763
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-23 14:18:29 +02:00
Simo Fält
b792fd56db Provisioning: Install libClang 10 with dynamic libs
As Qt uses only static archives of libclang, we have to install
dynamic version as an additional package. Libclang is required
for example QtForPython.

Pick-to: 5.15
Pick-to: 6.0
Change-Id: Ic9d70398113defe3561f261aee369b423c18686a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-23 08:02:32 +02:00
Volker Hilsheimer
d850eaed21 Use Extract-7zip helper to extract msys
The helper makes sure that all questions for confirmation are answered
with yes, which unblocks a second provisioning run.

Change-Id: I33b58a98ceed3f736eabde90e15e959a7139923e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-23 00:50:26 +01:00
Cristian Adam
5f4bd8911d CMake: Update provisioned CMake to version 3.19.2
Pick-to: 6.0
Change-Id: I9544eb3ba08b60d027e895031b93731c1e8d00af
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-22 19:03:33 +01:00
Simo Fält
0350263a07 Provisioning: Remove deprecated brew call
Pick-to: 5.15
Pick-to: 6.0
Change-Id: If956d0f77cd5c6763fc2314277c346d8f27e6eee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-22 13:22:57 +00:00
Allan Sandfeld Jensen
e38fc45740 Fix nodejs installation on windows
Was unpacked into a subdirectory with the same name as the archive

Pick-to: 5.15 6.0
Fixes: QTQAINFRA-4055
Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-11 15:26:12 +01:00
Tony Sarajärvi
1015211da7 Disable LSO regardless of network interface name
Pick-to: 6.0
Pick-to: 5.15
Change-Id: Ie439e11d9de6f71f4562b014b80a32fbf7660883
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-08 07:44:40 +02:00
Heikki Halmet
420d7f809c Update Windows 10 x86_64 version to 20H2
Windows 10 Enterprise 20H2, OS build 19042.508
Additional SW:
MSVC 2019 version 16.8.1
MSVC 2019 Build Tools version 16.8.1
MSVC 2015 14.0.25420.1
Virtio driver
Virtio Balloon driver
NetKVM driver
Vioserial driver
Guest-agent qemu-ga-x86_64

Pick-to: 6.0
Task-number: QTQAINFRA-3961
Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-04 12:17:14 +02:00
Heikki Halmet
cdea442a3a Provisioning: Install Azure tool
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:49 +02:00
Heikki Halmet
8846d0d52d Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:48 +02:00
Assam Boudjelthia
9b5c3f0a6d Android: update build tools and SDK level to 29 in CI
Pick-to: 5.15 6.0
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-11-24 13:23:31 +02:00
Heikki Halmet
4a37ec2dd5 Provisioning: Use Remove function when removing items in Windows
Sometimes items are locked by some windows process so that they can't be
removed. This will fail provisioning instantly.

Let's give the removing process more time by retrying if it will fail
on first attempt

Change-Id: Ic5c16c0d920ed0625d0c6830323d0bc6ba2cd608
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 10:35:55 +02:00
Alexandru Croitor
6b46bc3b7b CMake: Update provisioned CMake to version 3.19.0
Pick-to: 6.0.0 6.0
Change-Id: I9c5be93146882d5593bbe46811a653d6b2a88aee
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-20 19:25:56 +01:00
Tony Sarajärvi
2fb5125e5b Clean up unused provisioning scripts
Change-Id: Id6c5de28bde4a7870eb33d685c948bfcf48cb367
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-16 12:29:22 +00:00
Heikki Halmet
b34fa5f9cf Remove RedHat 7.6 from CI
CentOS 8.1 is now in CI without Insignificant flags so
Rhel 7.6 can be removed.

Task-number: QTQAINFRA-2760
Change-Id: Id797a6ea5bf9c4d64929b4d6e183d0c7146309ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2020-11-16 07:38:21 +02:00
Alexandru Croitor
dc84140127 CMake: Update provisioned CMake to version 3.19.0-rc2
We want to be able to build qdoc and lupdate on MSVC with
Ninja Multi-Config.

Task-number: QTBUG-85411
Task-number: QTBUG-88139
Task-number: QTBUG-87315
Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-12 18:21:53 +01:00
Tony Sarajärvi
fd4264aa63 Update Strawberry Perl to 5.32.0.1
Change-Id: I79f1f65af473f4925342267ab000d6261d3a7e42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-11 19:55:57 +00:00
Maurice Kalinowski
9a82a87954 Update MQTT test broker
Latest additions of CentOS cause troubles due to
- Updated SSL to set up tls servers
- Updated Python version, which removed API calls

For the latter, we only need to update the broker. TLS test servers
are not used in our setup. However, qtmqtt.git requires on further
update to load a different configuration.

Task-number: QTBUG-88189
Change-Id: I2d6e559a21dff41deca94aeec8c5db6fdf72a0ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-11-11 07:59:22 +01:00
Kai Koehne
c7e8d91332 Windows: Fix lookup of LLVM_INSTALL_DIR environment variables
"_ARCH_" was dynamically replaced by either 32 or 64 in
qttools/configure.pri. Anyhow, this is not supported by the
CMake build, and not needed, since we only build with 64
toolchains on Windows.

the qmake builds can still automatically select the "right"
toolchain by either loading LLVM_INSTALL_DIR_msvc,
LLVM_INSTALL_DIR_mingw. But for CMake builds
we now explicitly set LLVM_INSTALL_DIR in each configuration.

Fixes: QTBUG-87215
Change-Id: Iaa7e6eab676c03b34ea723d9f71888ca9ee7bb1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 16:57:21 +01:00
Heikki Halmet
134c2a1cb0 Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-30 16:14:37 +02:00
Edward Welbourne
9521eee18b Fix permissions on power-shell scripts and the shbang in a bash script
The power-shell scripts don't need to be executable (MS-Win doesn't
care and we don't run them on Unix).

The shbang line in a shell script only works if it's at the start of
the file, not after a blank line.

Change-Id: I12a927f414621187f867864617276528a59652e5
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2020-10-23 11:32:57 +02:00
Heikki Halmet
e98b85be22 Add CentOS 8.1 to CI
Insignificant flag is added for two targets. RedHat 7.6
will be kept as parallel until insignificant flag can be
removed from CentOS

Task-number: QTQAINFRA-2760
Task-number: QTQAINFRA-3065
Change-Id: If124600309644e6a066805cd728bf12862006a21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-16 15:57:06 +03:00
Heikki Halmet
f1e911e344 Provisioning: Replace SLES-15 with SLES-15 SP2
Task-number: QTQAINFRA-3921
Change-Id: I325a4b8f272dda80168aed1389e647bbd525b10f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-12 19:28:28 +03:00
Cristian Adam
ca02358af2 Provision RedHat libclang packages only for RedHat
While bulding on CentOS with Red Hat libclang packages we end up with
linker errors due to differences in C++ ABI used.

Ubuntu 18.04 package works fine with CentOS 8.1.

Task-number: QTBUG-86968
Change-Id: Idf0435a06046fb791b8ca1086e6465521ba6006a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-11 14:10:42 +02:00
Heikki Halmet
aee06febca Provisioning: Install Ninja binary
Install Ninja binary without using brew

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3954
Change-Id: I2f50814e26e756bbf5cf3d74a4a1c5c00426ab4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-08 21:31:29 +03:00
Heikki Halmet
b9158ca889 Provisioning: Update MSVC 2019 to version 16.7.5
Visual Studio 2019 can be updated with version specific online installer

Change-Id: I1ec1f96e68e8e3440d85240d09eec59a421708db
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-09-30 10:26:12 +03:00
Cristian Adam
74f29a622a CMake: Update provisioned CMake to version 3.18.3
This version should fix the iOS PCH builds and Ninja Multi-Config,
as well as the issues with AUTOMOC and Ninja.

Temporarily explicitly disable the pkg_config feature on Windows
hosts, because otherwise the configuration will break. The
FindPkgConfig module in 3.18 has some additional behavior for checking
if the found pkg-config works, and that's not handled by our
qt_build_internals_disable_pkg_config_if_needed function in qtbase.

Fixes: QTBUG-86862
Change-Id: I80514d3d7896ae09ab252aed10e86725fae0cc9c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-25 08:58:20 +02:00
Heikki Halmet
2076163c5e Provisioning: Install STM32CubeProgrammer
This will install STM32CubeProgrammer to Windows 10 needed by
MCU RTA

Task-number: UL-3091
Change-Id: I97f7df33af9bf4c56849c1cf3c93b3a413ba6f44
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-09-24 10:12:54 +03:00
Heikki Halmet
08c253a625 Provisioning: Install MCUXpresso
MCUXpresso IDE provides the tools for flashing and onboard debugging

Task-number: UL-3091
Change-Id: I05224af4ae7528f219f1b682ecd14bd0e331e3bf
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2020-09-22 14:27:46 +03:00
Konstantin Tokarev
f73fa57088 Provisioning: Update Conan to 1.29.0
Task-bumber: QTQAINFRA-3916
Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-16 08:58:35 +03:00
Konstantin Tokarev
c79904c463 Provisioning: Update Conan packages
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now

Task-bumber: QTQAINFRA-3916
Change-Id: Ib3355265dc35326d30eacb60d0e3c97f06e6f9be
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-16 08:58:33 +03:00
Johanna Äijälä
b43c199d4a Add missing Squish installation to win10 x86 Squish archive
Win10 x86 archive was missing msvc142 x86 package.

Pick-to: 5.15
Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-11 08:05:30 +00:00
Alexandru Croitor
572aadf1fb Android: Fix typo in ANDROID_SDK_HOME Windows host env var
Apparently qmake doesn't actually use the env var, but this failed
the WIP CMake Android configurations.

Amends e3600116b3

Change-Id: I30866af0eb63efefe72b709182f8cb5ba3250b12
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-09 13:58:17 +02:00
Heikki Halmet
e3600116b3 Provisioning: Update Android ndk and build tools
Task-number: QTQAINFRA-3846
Change-Id: I5d3c0efce86e3b8bc3c6070ed4a9e438647bb955
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-08 14:52:22 +03:00