Commit Graph

1212 Commits

Author SHA1 Message Date
Assam Boudjelthia
a4cc949b8d Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Pick-to: 6.3 6.2
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-23 19:22:22 +02:00
Heikki Halmet
1cc99e61dd Remove protobuf scripts for Windows
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.

Pick-to: 6.3 6.2 5.15
Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-02-22 08:16:46 +02:00
Toni Saario
a2393b5882 Update git
Older git version does not allow fetching single specific sha1.

Pick-to: 6.2 6.3
Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:45 +02:00
Tony Sarajärvi
55f8095928 Update llvm-mingw to version 14.0.0 RC1
Task-number: QTQAINFRA-4805
Change-Id: Id83058d4b23494a4d29777c3a828c3585c61113c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-22 08:16:43 +02:00
Heikki Halmet
73295cc05c Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Pick-to: 6.3
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:53 +02:00
Heikki Halmet
1597f43512 Provisioning: Run msvc 2019 update at the beginning of provisioning
When script was run with prefix 99 the installation process wasn't
finished before machine got rebooted. Moving the script at
beginning of provisioning seems to help with the situation. This is
not a proper fix but the best we have right now.
We can change this later if/when we find the root cause for this.

Pick-to: 6.3 6.2 5.15
Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-19 09:03:51 +02:00
Tony Sarajärvi
82ecf74768 Update llvm-mingw to version 13.0.0
When Windows 10 and 11 were updated, this was missing

Task-number: QTQAINFRA-4593
Change-Id: I52c920a5fc791db2039469f2931fa6c941f67e1e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-19 09:03:48 +02:00
Heikki Halmet
6c0950edf8 Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-19 09:03:46 +02:00
Johanna Äijälä
b3cd29e56f Provisioning: Squish 6.7.2
Update Squish packages to 6.7.2.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Id16b6337ff779eb21e1bd421ac46c57ad183dde2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-19 09:03:44 +02:00
Oliver Wolff
a91868e2c1 Update MSVC installer bootstrapper before updating MSVC itself
If there is an outdated MSVC installer bootstrapper an update to MSVC
might silently fail. Make sure that we update the bootstrapper before
calling the actual update.

NOTE! This change also upgrades MSVC 2019 version to 16.11.10

See https://developercommunity.visualstudio.com/t/setup-does-not-wait-for-installation-to-complete-w/26668
for some more information.

Pick-to: 6.2 6.3 5.15
Fixes: QTQAINFRA-4813
Change-Id: Ia595ceb5b373d1210670d3f357fb501bca1c8272
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-19 09:03:42 +02:00
Topi Reinio
69b329a55f coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\qmlvaluetype) used in
qtdeclarative documentation, as well as other fixes and
improvements.

Pick-to: 6.3
Change-Id: I6453468fb36dbe38d62f5eb9de74beffd568673b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2022-02-10 23:59:49 +01:00
Heikki Halmet
8732165461 Provisioning: Update OpenSSL to version 1.1.1m
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-02-05 15:59:17 +02:00
Heikki Halmet
3f263aa742 Move bluetooth script under correct platform folder
Pick-to: 6.3
Pick-to: 6.2
Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-05 15:59:15 +02:00
Heikki Halmet
72997d7039 Upgrade Xcode and Command Line Tools version to 13.2
Xcode 13.2 works only in macOS 11.3/12.0 or newer

Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-02-03 21:13:09 +02:00
Heikki Halmet
1865d70ef8 Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64

Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-02-03 21:13:07 +02:00
Heikki Halmet
88cde9e500 Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-03 21:12:55 +02:00
Pasi Petäjäjärvi
4a5550cc03 CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 11:34:01 +00:00
Pasi Petäjäjärvi
848a7d5fa3 CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:55 +02:00
Pasi Petäjäjärvi
2592bbe8c4 CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-01-29 13:33:34 +02:00
Heikki Halmet
1e8939b4b2 Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-01-11 13:47:26 +00:00
Toni Saario
81dcae4f93 Provision conan on arm macOS
Pick-to: 6.2 6.3
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-01-07 16:46:29 +02:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Ville-Pekka Karhu
fe35c4dbb0 macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:54 +02:00
Ville-Pekka Karhu
20c580e5db macOS provisioning: Disable bluetooth
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-19 14:39:48 +02:00
Heikki Halmet
9d09f9cee9 Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-12-17 09:40:41 +02:00
Pasi Petäjäjärvi
1cb9c1caef CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Pasi Petäjäjärvi
10a443c181 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-15 00:13:26 +00:00
Heikki Halmet
71e7ed17a2 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Pick-to: 6.2
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-14 09:37:27 +02:00
Simo Fält
ef4fcb8ac7 Provisioning: Set Python 3.9 as a default on Arm macs
The default intepreter under Frameworks is not working properly for
all CI use cases.

Change-Id: If665ea9ad81afa510c00162021ba7b143855cbd7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-12-13 11:38:55 +00:00
Pasi Petäjäjärvi
06edc60e1d CI: Add inotify support for QNX
Adds Filesystem event manager server to image and also add HOME env
varbiable for root user.

Task-number: QTBUG-99168
Pick-to: 6.2 6.3
Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-12-13 11:38:55 +00:00
Alexandru Croitor
6e7de2b76c Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Amends 7e2882d0a7

Augments d59825d250

Pick-to: 6.2 6.3
Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-12-13 12:38:55 +01:00
Ville-Pekka Karhu
dbb4cd06aa Provisioning: Enable keyboard navigation between controls on macOS
Task-number: QTQAINFRA-4660
Pick-to: 6.2
Change-Id: I12f2995c797e573d5072145c100ee64e98e133ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-11 19:31:16 +00:00
Marianne Yrjänä
e9258230f3 QNX: Update QNX toolchain
Timezone database added for tests

Pick-to: 6.2
Change-Id: I406e1ae0e9d1553f1588413d9cd20920674a907c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-12-11 17:33:21 +02:00
Morten Johan Sørvig
6f1ef4d3f6 Provisioning: Update emsdk to 3.0.0
emsdk 3.0.0 is the minimum/recommended version for
Qt 6.3.

The python/node/jre versions appear to be unchanged.
Remove the unused versionTag variable.

Change-Id: Ic7b72691295040f899a22c54066b0aea3995cd7a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-12-09 07:56:50 +01:00
Simo Fält
1e24a91028 Provisioning: Install addtional Python 3.10.0 for Windows 10
Pick-to: 6.2
Change-Id: Ied45a786c220a1a331e7546720d72db473ce504d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-12-08 07:36:26 +00:00
Heikki Halmet
7184b6b7b0 Provisioning: Install emsdk using emsdk.git
This will reduce the manual work when updating emsdk version
This requires also python certificates to be installed

Pick-to: 6.2
Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-04 12:36:10 +02:00
Heikki Halmet
4eaaaa7c7c Replace Windows 10 21H1 with Windows 10 21H2 in CI
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25420.1 Update 3
Visual Studio 2019 + build tools version 16.11.7
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4651
Pick-to: 6.2
Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-04 12:36:10 +02:00
Toni Saario
dfa50ed7c3 Set Conan V2 mode
V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.

Pick-to: 6.2
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
dcded49b88 Enable conan revisions mode
Pick-to: 6.2
Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
b2240d78cd Remove existing conan settings file
Due to existing conan file new versions of compilers etc. cannot
be used. Forcing Conan to generate a new one will allow using the
new versions in profile files.

Pick-to: 6.2
Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
5cf68160c2 Update conan on windows
This is required for the upcoming conan integrations.

Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Samuli Piippo
54c3a77fdf QEMU: update toolchains
Update qemu toolchains to include needed dependencies for QtWebEngine.

Pick-to: 6.2
Change-Id: Ia5cf09b3f94fe75d16304e717a9da04cb120ea79
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-26 14:21:09 +00:00
Heikki Halmet
8f46d3ede3 Add Windows 11 targets and provisioning scripts
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-26 15:42:27 +02:00
Allan Sandfeld Jensen
83b4afd584 Add python3 html5lib
Needed for qtwebengine in 6.3

Change-Id: I6dc941fabe4e28e3dce19db8f7812be034be8586
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-20 11:13:09 +01:00
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
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ø
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
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