Commit Graph

4843 Commits

Author SHA1 Message Date
Allan Sandfeld Jensen
cd8a69a4c2 Update RHEL 8 nodejs to 12
Change-Id: Ia74d0226499d07cb7d893ddb8b07f066237d8e6f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit e5d01ece3e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-20 04:33:43 +00:00
Tor Arne Vestbø
c474dd17ec coin: Don't set CMAKE_C/CXX_COMPILER_LAUNCHER for sccache explicitly
The coin 'Sccache' feature will take care of it.

Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3c38cc22ce)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 17:30:22 +01:00
Tor Arne Vestbø
2b652e1ecb coin: Align PostgreSQL provisioning between macOS 11 and macOS 12
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5733455993)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 16:30:20 +00:00
Tor Arne Vestbø
71910cefbc 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
Change-Id: Ica8d0f8c8d1d497bf0172a5762ae2d419b0ffc95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5de9c0fee3)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 16:30:17 +00:00
Tor Arne Vestbø
ed9970c92d 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>
(cherry picked from commit 9358ab26ed)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-18 12:05:41 +02:00
Heikki Halmet
0b5b8030a1 Add InsignificantTests flag for macOS 12 developer build tests
Change-Id: I3e325d1b8c7cf55b88876be9bcc33088fd28b4e9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit b37a42d381)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-18 12:05:40 +02:00
Ville-Pekka Karhu
39b34476c7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7e2882d0a7)
2021-11-17 17:43:00 +02:00
Heikki Halmet
1bd401b52c Replace Rhel 8.2 with Rhel 8.4
Task-number: QTQAINFRA-4514
Change-Id: Idaa28bf61d0ae7498fc019589a168b45e693594b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-17 17:43:00 +02:00
Iikka Eklund
6cc9c921cb Conan: Update build profiles
Remove mutually exclusive options.

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

Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8ef536b79e)
2021-11-17 09:34:39 +02:00
Iikka Eklund
26c981f41f Conan: Scope qtbase related options to qtbase recipe only
Some option names supported by qtbase Conan build recipe conflict with
other Conan package recipes, e.g. ICU which also supports 'shared'
option but with different supported option values.

Scope all qtbase related options in profiles to qtbase only.

Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3fea4fc3c6)
2021-11-17 09:34:33 +02:00
Iikka Eklund
b63c7662fe Add Conan profiles
Create conan profile per packaging configuration. Profiles will
carry configuration information to the builds conan does.

Profiles allow users to replicate identical configurations
to the packaging configurations and reuse existing binaries.

Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d68e108b94)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-16 10:54:33 +02:00
Heikki Halmet
08a0a1ce46 Add targets for macOS 12 arm64
Task-number: QTQAINFRA-4508
Change-Id: I3b53b0c0654519644d56df1ea935724f68964241
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 8c06db541a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 17:35:37 +00:00
Heikki Halmet
6bd3c8ed27 Remove Sccache flag from QNX targets
This might cause issues with compiler

Task-number: QTQAINFRA-4648
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e27a7d5e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 14:40:32 +00:00
Heikki Halmet
6cda40d952 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

In 6.2 branch Packaging targets needs to be as parallel
first. MinGW 8.1 can be removed ones Releasing team has
done needed script changes

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>
(cherry picked from commit ce9ef40366)
2021-11-15 09:24:18 +02:00
Tor Arne Vestbø
70c27d6e69 coin: Add PostgreSQL 14 to macOS 11 images
Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 881738a01d)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-13 01:14:47 +00:00
Heikki Halmet
954f29898d Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 30a1ea30a6)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-12 11:47:20 +02:00
Jani Heikkinen
28d65ee09c Update target configurations for Qt QML Script Compiler
Reposity is nowdays tqtc-qmlcompilerplus, not tqtc-qmlcachegenplus

Pick-to: dev
Change-Id: I4134e74e68184c15fc65c48da57e2523093a20e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-10 10:01:30 +02:00
Qt Submodule Update Bot
898076adf7 Update submodules on '6.2 in qt/qt5'
Change-Id: I65f53c16b3a8a9af1898671648ddfee4d78da871
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-11-09 17:03:39 +00:00
Tor Arne Vestbø
23ade45981 coin: Enable warnings are errors for macOS builds
Change-Id: I418c207a95a1cd1f827873a7f19178421fdfd10f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 296b7faaad)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-05 10:49:57 +00:00
Tony Sarajärvi
a80c835333 Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498
Change-Id: I248a0ea19a7e2af59350ba66b55983c20927fff3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 426bab28a8)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-04 18:47:43 +02:00
Assam Boudjelthia
5893f0d3df Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 286a294daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-04 12:52:49 +00:00
Tor Arne Vestbø
eefe05467d 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.

Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c273c5bc65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-04 11:10:59 +00:00
Ivan Solovev
409931d897 Update qtlocation dependencies
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.

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>
(cherry picked from commit 70a8080f54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-01 21:26:09 +00:00
Heikki Halmet
0d35051d65 Provisioning: Update Integrity toolchain to fix GHS error
Task-number: QTQAINFRA-4601
Change-Id: Ica32904ef6e76bc9f9f972f8c6bf02822980f888
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f4f80d1b0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-31 18:38:29 +00:00
Pasi Petäjäjärvi
0b680fb549 CI: Update QNX ICU libraries for QEMU
New QNX toolchain has updated ICU libraries

Task-number: QTBUG-87628
Change-Id: I36806c815410877998eb44bef60614bf824f15f9
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 8d7f2db3a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-30 11:22:54 +00:00
Assam Boudjelthia
f4903d61e8 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

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>
(cherry picked from commit d59825d250)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2021-10-30 09:58:43 +00:00
Heikki Halmet
91c20d709a Provisioning: Change cache url suffix ci.local to intra.qt.io
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit ba32df291c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:32 +00:00
Heikki Halmet
5bffe4c688 Provisioning: Change locale and language settings
Let's script this so we can be sure which language settings are in use

Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8fac7c92c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:31 +00:00
Heikki Halmet
082500cb93 Provisioning: Remove unused code from JDK installation script
Amends abd2e0b381

Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 36a58374d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:31 +00:00
Pasi Petäjäjärvi
8a0f13d7ae CI: Move QNX qemu specific configurations to own file
Task-number: QTBUG-87628
Change-Id: Ifc360071a08304270d75a505eecbd9c2da635c00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0b97c457a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 11:52:53 +00:00
Pasi Petäjäjärvi
1c7bb0892a CI: Add QNX QEMU image build package
* Define env variables needed
* Add build files only to create qemu image

Task-number: QTBUG-87628
Change-Id: I26fd10b3e7950c7226c3c66f0b385b1acf0ac118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit fe0b819588)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:49 +00:00
Pasi Petäjäjärvi
f30c29dd88 CI: Add NFS export
Export work directory via NFS for QNX qemu

Task-number: QTBUG-87628
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>
(cherry picked from commit ffc3ef20a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:42 +00:00
Pasi Petäjäjärvi
27db125230 Provisioning: Install NFS support required by QNX QEMU
Task-number: QTBUG-87628
Change-Id: I9100dd7eda11a9a6ebf35aa6100c6bf983402b64
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b580128093)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:34 +00:00
Ivan Solovev
eb874192c9 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
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 6af22246cf)
2021-10-26 09:54:56 +02:00
Heikki Halmet
e3a457f60d Provisioning: Upgrade Java JDK to version 11
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>
(cherry picked from commit abd2e0b381)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2021-10-22 07:27:25 +03:00
Heikki Halmet
deaf7dddca 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
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 3de398e6eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-21 19:14:27 +00:00
Johanna Äijälä
b749b2689a 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>
(cherry picked from commit 5271d9f1cf)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-10-21 07:56:02 +03:00
Dominik Holland
daf76912b8 Provisioning: Update Python packages to the latest version
Change-Id: I31f3eb4f2d633015105b2915eb8e385c1c2aa6cf
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 308584fbfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:48 +00:00
Ivan Solovev
94cd0802f3 Enable CI for qtpositioning repo
Task-number: QTBUG-97187
Change-Id: I46cab4dffa8ede6a28f479ee693e2296e8a7c535
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d0de34c4e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:40 +00:00
Simo Fält
76b0e26e7a Provisioning: Update Python in macOS to 3.9.6
Change-Id: I092513727642b34cc71034dab96c78eaecfe72f1
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ea89779e22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:40 +00:00
Heikki Halmet
309c6694df Provisioning: Add OpenSSL for Android to macOS
Task-number: QTBUG-97243
Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2aa8303236)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-10-20 12:34:00 +03:00
Samuli Piippo
d7944ea8c6 Add zstd to Ubuntu 20.04
Needed for bitbake.

Change-Id: Ib7be3a971b970311adca25f46238d3fae838cba9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 663ebcb102)
2021-10-15 12:01:54 +03:00
Marianne Yrjänä
3a8ccd8bad Update QNX toolchain
Change-Id: I6edd66365d73996ca4d02ee82ab86e63bb190fa7
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 153c7680cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-14 08:40:54 +00:00
Qt Submodule Update Bot
4d90a09487 Update submodules on '6.2 in qt/qt5'
Change-Id: Ib8a94b52cf2e0854bed30d93ae8b6014eeafc9c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-13 06:50:15 +00:00
Joerg Bornemann
31610bf8c0 CI: Turn dbus support off for QNX_710
QtDBus is built even if system dbus is not found, and QtGui depends
on QtDBus.  To link a consumer of QtGui, the -rpath-link option must
be passed to the linker.  That is not done at the moment, due to
QTBUG-86533.

Fixes: QTBUG-96791
Task-number: QTBUG-86533
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 420adf322a)
2021-10-11 09:21:27 +00:00
Qt Submodule Update Bot
ae8b953343 Update submodules on '6.2' in qt/qt5
Change-Id: I6368ed7114d701c5ca31fda39a8d6f1f14cfde2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-07 13:03:48 +03:00
Qt Submodule Update Bot
2e91316fa3 Update submodules on '6.2' in qt/qt5
Change-Id: If9157e50a35e57e9d59ee34b2eccea6ac73286e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-06 00:59:30 +03:00
Heikki Halmet
ed724f842b Provisioning: Re-install ca-certificates for Ubuntu 20.04
This makes sure that needed ca-certificates are installed during
provisioning

Change-Id: I39289f237a54ca0805b1d9116ee899aecf02e72f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3b09730b44)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 18:15:19 +00:00
Qt Submodule Update Bot
564fddd1aa Update submodules on '6.2' in qt/qt5
Change-Id: Icdc8dd2095e2e0a5636f8c89181d39e0936e0c7f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-04 20:57:41 +03:00
Qt Submodule Update Bot
8df89f1f84 Update submodules on '6.2' in qt/qt5
Change-Id: Id05b4bef885c7115694077c9db0bf6ee9cd7d761
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-02 06:55:56 +03:00