Commit Graph

4850 Commits

Author SHA1 Message Date
Allan Sandfeld Jensen
e5d01ece3e Update RHEL 8 nodejs to 12
Pick-to: 6.2
Change-Id: Ia74d0226499d07cb7d893ddb8b07f066237d8e6f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-19 12:27:46 +00:00
Heikki Halmet
278516d142 Provisioning: Change using GitHub package for MinGW 11.2.0
Pick-to: 6.2
Pick-to: 6.2.2
Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 18:19:39 +02:00
Heikki Halmet
249603dc4f Provisioning: bump Android platform sdk and build tools version to 31
Use latest platform and build tools with macOS 12

Pick-to: 6.2
Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-17 18:19:39 +02:00
Heikki Halmet
b37a42d381 Add InsignificantTests flag for macOS 12 developer build tests
Pick-to: 6.2
Change-Id: I3e325d1b8c7cf55b88876be9bcc33088fd28b4e9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-17 18:19:39 +02:00
Tor Arne Vestbø
5de9c0fee3 Build iODBC library as universal binary on macOS 11+
As per instructions here:

  https://github.com/openlink/iODBC/blob/develop/README_MACOSX.md

Task-number: QTBUG-93204
Pick-to: 6.2 6.2.2
Change-Id: Ica8d0f8c8d1d497bf0172a5762ae2d419b0ffc95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-17 17:19:39 +01:00
Tor Arne Vestbø
190c324d8f coin: Add missing platform dependency to macos-12-arm64-tests
Pick-to: 6.2
Change-Id: I507acf803a86a6b200e1bc5fb1599631deed3b40
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-17 17:19:39 +01:00
Tor Arne Vestbø
5733455993 coin: Align PostgreSQL provisioning between macOS 11 and macOS 12
Pick-to: 6.2
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-17 11:13:48 +01:00
Tor Arne Vestbø
9358ab26ed coin: Disable PostgreSQL on macOS 12 builds
The provisioning doesn't support it yet.

Change-Id: Icf0cea1b58813a1e0037c00c726f4cc9096d0ac8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2021-11-16 23:08:38 +00:00
Ville-Pekka Karhu
7e2882d0a7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-16 14:52:03 +02:00
Ville-Pekka Karhu
1b1005038b Pre-provisioning: macOS Tier1 creation instructions
Change-Id: I17f6f55c4be878b74c80735e0101619730548056
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-16 10:05:07 +02:00
Heikki Halmet
8c06db541a Add targets for macOS 12 arm64
Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: I3b53b0c0654519644d56df1ea935724f68964241
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-11-15 16:00:12 +02:00
Jani Heikkinen
7294c6a80b Update target configurations for Qt QML Script Compiler
Reposity is nowdays tqtc-qmlcompilerplus, not tqtc-qmlcachegenplus

Change-Id: I4134e74e68184c15fc65c48da57e2523093a20e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 28d65ee09c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 07:08:13 +00:00
Heikki Halmet
ab7d990ec3 Add temporary emsdk_env.bat for webassembly
Let's use this temporary hack so that we can get support
for setting Emscripten environment for Webassembly through qtbase

This change will be removed when we start installing emsdk using
emsdk.git. That installation process will automatically set emsdk_env.bat

Change-Id: I6eb417b28c9ca0cd01a743dea2fa38540fd4dcc3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-12 16:39:33 +02:00
Heikki Halmet
9e27a7d5e3 Remove Sccache flag from QNX targets
This might cause issues with compiler

Task-number: QTQAINFRA-4648
Pick-to: 6.2
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-12 13:14:05 +02:00
Tor Arne Vestbø
881738a01d coin: Add PostgreSQL 14 to macOS 11 images
Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Pick-to: 6.2 5.15
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-12 11:18:20 +01:00
Fawzi Mohamed
4abe5ad424 Add qtlanguageserver repository
Change-Id: If6f67fea02436e0000c0ae4b6f18c4c000504f88
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-11 09:31:35 +00:00
Qt Submodule Update Bot
6d94035b1c Update submodules on 'dev in qt/qt5'
Change-Id: I55fc97db5ad49383a1d16988fa315507b5ead634
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-11-11 07:41:54 +00:00
Tor Arne Vestbø
3c38cc22ce coin: Don't set CMAKE_C/CXX_COMPILER_LAUNCHER for sccache explicitly
The coin 'Sccache' feature will take care of it.

Pick-to: 6.2
Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-09 12:25:21 +01:00
Ville-Pekka Karhu
478531ac2b Provisioning: Add macOS Monterey (12) ARM scripts
Task-number: QTQAINFRA-4508
Change-Id: Ia93e534b6911b6aaef2a0107b067c1ba5e6a6224
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-09 12:19:01 +02:00
Heikki Halmet
30a1ea30a6 Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-09 09:01:19 +02:00
Iikka Eklund
8ef536b79e Conan: Update build profiles
Remove mutually exclusive options.

Set the 'build_type' correctly so that it reflects the used build
Options.

Pick-to: 6.2
Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-08 08:23:24 +00:00
Simo Fält
9011988e38 Provisioning: Install python3 on arm macOS
Change-Id: I9084429dfac5860643484b6c66fa4fb902b38ce2
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-05 10:30:54 +00:00
Tor Arne Vestbø
c273c5bc65 coin: Disable sccache for Integrity
The platform doesn't support sccache, and the "feature" was
likely cargo culted from some other config, as it was a noop
at the time.

Pick-to: 6.2 5.15
Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-04 10:18:02 +00:00
Tor Arne Vestbø
56daf9b4c0 coin: Build iOS on macOS 11 so we can use a recent Xcode and SDK
Change-Id: I925c040d93b6b0126fc892673abb11a8387d6f27
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-04 02:28:12 +01:00
Tor Arne Vestbø
296b7faaad coin: Enable warnings are errors for macOS builds
Pick-to: 6.2
Change-Id: I418c207a95a1cd1f827873a7f19178421fdfd10f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-03 11:45:03 +01:00
Ivan Solovev
70a8080f54 Update qtlocation dependencies
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.

Pick-to: 6.2
Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-11-01 10:12:19 +02:00
Pasi Petäjäjärvi
8d7f2db3a0 CI: Update QNX ICU libraries for QEMU
New QNX toolchain has updated ICU libraries

Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I36806c815410877998eb44bef60614bf824f15f9
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-30 11:37:10 +03:00
Heikki Halmet
f4f80d1b0f Provisioning: Update Integrity toolchain to fix GHS error
Task-number: QTQAINFRA-4601
Pick-to: 6.2
Change-Id: Ica32904ef6e76bc9f9f972f8c6bf02822980f888
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-29 21:01:42 +03:00
Assam Boudjelthia
286a294daf Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Pick-to: 6.2
Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-10-29 15:08:36 +00:00
Heikki Halmet
8fac7c92c9 Provisioning: Change locale and language settings
Let's script this so we can be sure which language settings are in use

Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-29 06:51:55 +00:00
Heikki Halmet
36a58374d6 Provisioning: Remove unused code from JDK installation script
Amends abd2e0b381

Pick-to: 6.2
Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-29 09:51:52 +03:00
Heikki Halmet
ba32df291c Provisioning: Change cache url suffix ci.local to intra.qt.io
Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-29 09:51:48 +03:00
Ivan Tkachenko
d4d524c8db Fix code formatting in README
Change-Id: I333cfd215f6a5d54f2e1098a7a68b76a8dc7af4d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-10-28 16:29:13 +03:00
Pasi Petäjäjärvi
b580128093 Provisioning: Install NFS support required by QNX QEMU
Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I9100dd7eda11a9a6ebf35aa6100c6bf983402b64
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-27 10:12:03 +03:00
Pasi Petäjäjärvi
ffc3ef20a3 CI: Add NFS export
Export work directory via NFS for QNX qemu

Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I57a2f612cf268bef4582726c9b0a1b953e74034b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-27 07:11:55 +00:00
Pasi Petäjäjärvi
0b97c457a8 CI: Move QNX qemu specific configurations to own file
Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: Ifc360071a08304270d75a505eecbd9c2da635c00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-27 10:11:47 +03:00
Pasi Petäjäjärvi
fe0b819588 CI: Add QNX QEMU image build package
* Define env variables needed
* Add build files only to create qemu image

Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I26fd10b3e7950c7226c3c66f0b385b1acf0ac118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-27 10:11:27 +03:00
Heikki Halmet
ce9ef40366 Replace MinGW 8.1 with MinGW 11.2.0 in CI
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW

Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-25 11:39:07 +03:00
Topi Reinio
134a8546c6 coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc has fixes that enables us to enforce zero warnings on
all qtbase modules.

Change-Id: Ie47011fa524fb869fb1e8856fd8c377e14be7e69
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-10-22 11:12:29 +02:00
Assam Boudjelthia
d59825d250 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-10-22 09:14:29 +02:00
Ivan Solovev
6af22246cf Add qtpositioning as a submodule
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.

Task-number: QTBUG-97188
Pick-to: 6.2
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-10-21 11:16:20 +02:00
Dominik Holland
308584fbfd Provisioning: Update Python packages to the latest version
Pick-to: 6.2
Change-Id: I31f3eb4f2d633015105b2915eb8e385c1c2aa6cf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-20 19:51:04 +03:00
Simo Fält
ea89779e22 Provisioning: Update Python in macOS to 3.9.6
Pick-to: 6.2
Change-Id: I092513727642b34cc71034dab96c78eaecfe72f1
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-10-20 19:51:04 +03:00
Ivan Solovev
d0de34c4e1 Enable CI for qtpositioning repo
Task-number: QTBUG-97187
Pick-to: 6.2
Change-Id: I46cab4dffa8ede6a28f479ee693e2296e8a7c535
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-10-20 18:51:04 +02:00
Johanna Äijälä
5271d9f1cf Provisioning: update Squish on linux and macOS
Custom Squish 6.7.1 for Qt6.2, macOS package back in the original form
without separate Squish server for Qt6.2.
Pick to: 6.2

Change-Id: I1edb9625f1d2891047d24676019448e8dd0fbaeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-10-20 17:24:27 +03:00
Heikki Halmet
3de398e6eb Provisioning: Upgrade Vulkand SDK to the latest version
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum

Task-number: QTQAINFRA-4532
Pick-to: 6.2
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-19 07:48:09 +03:00
Heikki Halmet
2aa8303236 Provisioning: Add OpenSSL for Android to macOS
Task-number: QTBUG-97243
Pick-to: 6.2
Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-10-18 14:22:16 +03:00
Heikki Halmet
abd2e0b381 Provisioning: Upgrade Java JDK to version 11
Pick-to: 6.2
Task-number: QTQAINFRA-4596
Change-Id: I5c67f220b5a1f3115032eb509d1d391cf1e520a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-15 09:51:01 +03:00
Qt Submodule Update Bot
34eb1adcdc Update submodules on 'dev in qt/qt5'
Change-Id: Ibcfd8c879fb92824721dd468ec81a6750501789a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-13 02:19:05 +00:00
Toni Saario
3c9b5b210f Fix windows tier1 image name
Patch 33734ad9c1 introduced a platform
with invalid tier1 name.

Change-Id: I701d3b891c0c0d96dfbd0c86c2ac709b218a1106
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-10-11 18:31:13 +03:00