Commit Graph

5214 Commits

Author SHA1 Message Date
Heikki Halmet
d2770134a5 Add RHEL 9 to CI
This will replace RHEL 8

Task-number: QTQAINFRA-5111
Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 5880c423c8)
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-01-03 10:14:17 +00:00
Qt Submodule Update Bot
4b5e5a6cbb Update submodules on '6.5 in qt/qt5'
Change-Id: I2770ebaab322dafd2874d12be55e9b9479f683af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-01-03 03:43:26 +00:00
Heikki Halmet
430ad49cc6 Change to use sha256 signed opengl32 mesa dll files
Task-number: QTBUG-108774
Change-Id: I7d2716aa23215b783365c293c968aeeef6626126
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1fd2a26492)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-03 01:38:06 +00:00
Qt Submodule Update Bot
9cade4393f Update submodules on '6.5 in qt/qt5'
Change-Id: Ia8c293e479163e50f82a2ca6c58f98b63cd2999b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-30 16:26:59 +00:00
Simo Fält
af2cb2edc4 Provisioning: Update default python3 version
Removing python3.6 and replacing it with more recent versions.

Change-Id: If8cd4c369e4fc9ff8dc7d53865b80b588f278091
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 95e9f8da9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-29 15:46:03 +00:00
Qt Submodule Update Bot
829cdbe4c8 Update submodules on '6.5 in qt/qt5'
Change-Id: I5a0020081d96eb2ae2de2f845a1067ce56b96277
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-29 12:23:59 +00:00
Qt Submodule Update Bot
435d3d93e7 Update submodules on '6.5 in qt/qt5'
Change-Id: I494a67dd1dbb9848a97c2346204eb7682e910756
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-28 21:21:17 +00:00
Morten Sørvig
4ee1668f46 wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25

Change-Id: I23e0d0b6951a4d69aa431710114ec2c06f7afcc3
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-12-28 11:22:31 +01:00
Qt Submodule Update Bot
d0b83ce01d Update submodules on '6.5 in qt/qt5'
Change-Id: Ibd66204695ee87f648a950d5affdc181c337d4d2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-26 23:59:12 +00:00
Qt Submodule Update Bot
d2e198c573 Update submodules on '6.5 in qt/qt5'
Change-Id: Ie72ddc0ff21f4d2cc2ef6dc4acc07a73b9d04cc8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-24 03:39:49 +00:00
Qt Submodule Update Bot
378d3e3548 Update submodules on '6.5 in qt/qt5'
Change-Id: I82a154c925dcd91c8571eb3a77d41ab066876d07
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.5.0-beta1
2022-12-17 05:25:08 +00:00
Qt Submodule Update Bot
8d06a5f76f Update submodules on '6.5 in qt/qt5'
Change-Id: I4291dd079f52e7c3f201363e0a61955e04a0324f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-15 04:48:36 +00:00
Jani Heikkinen
b30ea9dcf5 Adjust submodule branches
Change-Id: I8a267511cbb8fa63bb1e8e99d9cfbf66523fef9e
2022-12-13 07:52:52 +02:00
Konrad Kujawa
63d72293b7 Add provisioning for gRPC
Add provisioning scripts to install gRPC.
gRPC is requirement to build QtGrpc

Task-number: QTBUG-105492
Change-Id: I1a6d008a1d2c1616000909aacdb721401f706168
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-12-07 07:57:21 +01:00
Tor Arne Vestbø
21be8b0c05 Run tests with FFMpeg backend on macOS without depending on CMake variable
The mechanism employed where a CI test configuration would add
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' to its
environment variables to trigger QT_MEDIA_BACKEND=ffmpeg, was
needlessly indirect and based on conditions that didn't make
sense.

The logic now lives in the qtmultimedia repository.

Change-Id: I46b8fc1df45676b060157bfd670e9971980f0369
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-12-06 15:17:40 +01:00
Fabian Kosmale
5091ac1c2c Revert "Android: Add WarningsAreErrors to Android targets"
This reverts commit d522c16201.

Reason for revert: This currently breaks CI, as declarative
and qtbase are in fact not warning free.

Change-Id: I52ecd7e845ea5ed3b47a6e7dd6426c6ac57b1095
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-06 11:09:28 +00:00
Assam Boudjelthia
d522c16201 Android: Add WarningsAreErrors to Android targets
Many times there were warnings of comparison of signs which can go
unnoticed for various Android ABIs, so make warnings as errors
to make sure to catch such issues on the fly.

Change-Id: Idbc65bb3533188705ff7f7b9aaaf9de093817e4b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-12-06 01:13:36 +02:00
Alexandru Croitor
4588f198cd CMake: Run iOS build tests in qtdeclarative
Pick-to: 6.4
Task-number: QTBUG-96056
Change-Id: I7c3c3d9d3802ceb71dbca6eb85b7f544b7bb05f2
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-12-05 23:05:19 +01:00
Qt Submodule Update Bot
3641e6c8a0 Update submodules on 'dev in qt/qt5'
Change-Id: Ida1538ae0bc02b83d3227fc32fe1afa275613eb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-12-02 20:00:43 +00:00
Alexey Edelev
c32a843766 Bump macOS minimum deployment target to 11 for 3rd party dependencies
3rd party dependencies should be built using the same minimum deployment
target as Qt uses for compatibility.

Change-Id: I2edb2c19b90757898f6dcb76ad60602ae2249ebc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-29 11:32:13 +01:00
Tor Arne Vestbø
6652583be2 Remove macOS 10.15 test configurations
macOS Catalina (10.15) has reached its end-of-life, and is no longer
supported with bug fixes or security updates by Apple.

Change-Id: Id8c222ee28f48b551c3522bfd353cf71be74d62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-28 18:09:20 +01:00
Tor Arne Vestbø
7143bb3079 Make iOS tests significant again
We now have CMake 3.24 in CI, so we can re-enable the iOS tests.

Fixes: QTQAINFRA-5224
Change-Id: I742a9182299fb8ac6c52187a06a223a837d3968e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-11-28 18:09:20 +01:00
Oliver Wolff
37c0cf82ae Provisioning: MSVC 2019 update: Add Vswhere helper function
Pick-to: 6.4 6.2
Change-Id: Idd6bf24450d9447c38c39c64abff5b55d71c12b9
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
2022-11-28 09:00:42 +01:00
Heikki Halmet
fb34091c45 Pin mesa-libEGL and mesa-libGL versions for RHEL 9
Version 22.1.5-2.el9 cause crash with Xorg during bootup. Older version
seems to work correctly

Task-number: QTQAINFRA-5302
Change-Id: I470ce3d3a9941b17c6e6c31778bc1ee91659e5a5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-27 13:48:31 +00:00
Heikki Halmet
6567b8a7c4 Add qtattributionsscanner binaries built on Ubuntu 22.04
Libicu66 installation can be removed now

Task-number: QTQAINFRA-4926
Change-Id: I3c8b67e9445c1268aeaf16bf1539cabb50b2cf86
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-11-26 18:39:59 +00:00
Alexandru Croitor
6943f28b17 CMake: Update provisioned CMake to version 3.24.2
Needed to fix iOS Xcode generator builds when using Xcode 14.
Otherwise compiler identification fails due to a code-signing error.
We hit it in our iOS MinimalStaticTests configuration.

 error: Cannot code sign because the target does not have an
        Info.plist file and one is not being generated
        automatically.
         (in target 'CompilerIdCXX' from project
         'CompilerIdCXX')

See https://gitlab.kitware.com/cmake/cmake/-/issues/23719

Amends eee152ca70

Fixes: QTQAINFRA-5044
Change-Id: Idabd78e6e28816a8fc4dd7e627de82f2c622c54e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-26 18:19:17 +01:00
Alexey Edelev
661636f3e8 Add the missing protobuf provisioning script for MacOS 11 x86_64
Change-Id: I5c607a05b2f040e90cc0c4a2220d8565881c4983
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
2022-11-25 09:50:50 +01:00
Alexey Edelev
76a44df841 Adjust CMAKE_OSX_DEPLOYMENT_TARGET for protobuf package across MacOS platforms
Change-Id: Ie9f1b2273c437016fd51173e330a5df4cc924ebc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-25 09:50:46 +01:00
Allan Sandfeld Jensen
bb89b5ca77 Add optional dependencies for QtWebEngine
To better use system libraries and reduce the size of webengine libs

Change-Id: I626327e123ee93bc25f5b40d5adbdffa6dfb772d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 22:27:26 +01:00
Heikki Halmet
fae885e9c1 Provisioning: Make bootstrap autostart run without terminal
Terminal in UI might cause issues with Autotest
This patch makes bootstrap-agent run in a background shell wrapper.

The wrapper waits 20secs for the VM's network to come up and exits
with an error if it doesn't.
After that it waits for 20secs for the context image to be mounted.
If no context image is mounted after that, it waits for one minute
and makes one mounting attempt, before launching bootstrap-agent with
or without context.

Pick-to: 6.4 6.2
Task-number: COIN-966
Change-Id: I9a3e490325d1fd7c0583b6d5db5eb2023e042571
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 21:18:53 +00:00
Jani Heikkinen
0a49fc9d7d Add qtquickeffectmaker submodule
Task-number: QTBUG-108164
Change-Id: Ie3887bc420a0451e40a64afc14273ed40790c99f
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
2022-11-24 18:58:44 +02:00
Artem Dyomin
817a6d07f8 Add diffutils to msys2
cmp command is used by ffmpeg ./configure

Pick-to: 6.4
Change-Id: If80664d6c3318b7605c69d50e7606a1ec10840ea
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-24 09:54:11 +01:00
Artem Dyomin
5ef8294f3f Enable llvm-mingw ffmpeg windows build
- Added build of ffmpeg for llvm-mingw
- Improved build errors handling
- Refactoring: decompose script into a few functions

Build example:
https://testresults.qt.io/coin/integration/qt/qt5/tasks/web_qt_qt5_1668780311363
See tests for LLVM-x64, they passed

Pick-to: 6.4
Change-Id: I59fe28ba6eb8e65ef5c4c3d08343ff72f349bd21
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-24 09:53:57 +01:00
Jani Heikkinen
d4cc1708ba Change qtlocation from 'ignore' to preview
Task-number: QTBUG-108726
Change-Id: I13ff5af38c846358a9091ce4e0ca3100b4054b39
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-11-24 09:14:18 +02:00
Jani Heikkinen
27dd0c29fe Qt6: Build wasm target binaries only once
non-threaded Wasm build will be built only in windows.

threaded wasm build will be done in macOS.

thread-asyncify wasm build will be done in linux.

Change-Id: Ibea96aca1ec4ce15c632ba2f4223d898f6ebffaa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 09:14:04 +02:00
Rami Potinkara
0b88c1e2f0 Make qtwebview significant for Android 12 emulator in CI
Needs blacklisting of tst_QQuickWebView::settings_JS

Task-number: QTBUG-108752
Task-number: QTQAINFRA-4733
Change-Id: Icf3ed9f223195d602b1c28c42afb26e53157fec8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-24 05:09:39 +00:00
Samuli Piippo
2b8f50a2d1 Add universal libusb binaries to macOS
Brew does not support universal binaries, but provides separate
amd64 and arm64 packages. We need to add arm64 binaries for libus,
so that the universal builds work also for QDB.

Use brew to fetch both architecture packages and use them to
create universal libs for the libusb.

Remove from macOS 10.14, add to macOS 12 arm.

Task-number: QTBUG-107457
Pick-to: 6.2
Change-Id: If19fd6d303a20d8742c88ea11d5b30cc55f45d6b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-24 05:38:38 +02:00
Alexey Edelev
ab0b005a57 Add the missing additional CMake host prefix to Android and WASM platforms
Add QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH for Android and WASM
platforms to allow CMake find the host qtprotobufgen. The prefix points
to a host Protobuf package which qtprotobufgen depends on.

Change-Id: I2250614dceafb4b93a8a13ddb549f4ecc459436b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 20:07:51 +01:00
Konrad Kujawa
2034c71953 Update Protobuf to 21.9 version
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 09:14:04 +01:00
Mårten Nordheim
1c09ad4cf8 Fixup protobuf provisioning scripts on linux machines
Amends 134c07923c

Change-Id: I53ddfc390068dd7ed5ab3867c632027c0b9b24f2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-11-23 07:54:34 +01:00
Heikki Halmet
a66995e175 Make ASAN target to use latest openSUSE 15.4
Task-number: QTQAINFRA-5049
Change-Id: I390221f9cd347ad3b4ebf038bc392d8d7b8411e9
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-11-20 06:13:50 +00:00
Topi Reinio
9e4e6a565a Provisioning: Restore qdoc/qtattributionsscanner binaries on Ubuntu 22.04
The binaries were built on Ubuntu 20.04 and need a specific version of
libicu to work. Temporarily install libicu66 to be able to use common
binaries on both 20.04 and 22.04.

Change-Id: Ibb0bec24f1451ec48a79c6c978256c9d1474adee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-18 22:06:27 +00:00
Heikki Halmet
e9b3497c8e Add Windows 10 22H2 to CI
Pre-installed to tier 1:
          MSVC 2022 17.3.6 plus build tools
	  MSVC 2019 16.11.20 plus build tools
          MSVC 2015 update 3 14.0.25420.1

Task-number: QTQAINFRA-5262
Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-18 08:34:53 +00:00
Heikki Halmet
3d05c67749 Add Windows 11 22H2 to CI
Windows 11 21H2 will be replaced by 22H2 version

Task-number: QTQAINFRA-5203
Pick-to: 6.4
Change-Id: Iad18055cf84d9c1ff38984611c820b1c23d663a2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2022-11-18 08:34:51 +00:00
Jani Heikkinen
b3b41c2ef7 Add qtgrpc submodule
Task-number: QTBUG-107916
Change-Id: I41d6436b92941efa614fa6b6d5ed31a7c3bc7e5a
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-18 05:28:39 +00:00
Luca Di Sera
487c92a3d0 Update QDoc libclang to 15.0.0
The `libclang_version` variable is now updated to the current version, 15.0.0,
in both "coin/provisioning/common/unix/libclang.sh" and
"coin/provisioning/common/windows/libclang.ps1".

The naming of the artifacts for the provided library was slightly
changed from previous versions.

Before, the version number would contain two integers separated by a
dot.
The generated artifact would be named after this version number, with
the dot removed.

That is, for example, for version 12.0, a release artifact would be
called "libclang-release_120.*".

The updated two version uses a three segments version number and,
furthermore, the artifacts name do not collapse the separating dots such
that a release artifact would be called "libclang-release_15.0.0.*".

To support the new naming scheme, some processing was removed from both
provisioning scripts.

For Windows, the line removing all dots from the `libclang_version`
variable was removed.

For Unix, the removal of the dots in the `libclang_version`
variable when expanding the variable to generate the target urls to
retrieve the artifact was removed, using the bare value of the variable
itself.

For Unix provisioning, the artifacts for some of the platform, namely
"CentOS" and "Ubuntu 22.04", are not provided anymore.

"CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url
for the redhat platform was modified based on the new name.

The "Ubuntu 22.04" artifacts were not provided, such that the platform
was removed.

The sha1 of the target artifacts on both provisioning script was updated
for all platforms.

Task-number: QTBUG-107199
Pick-to: 6.4
Change-Id: I873680825b0953e897c610fb0b47f3cd90625646
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-11-17 20:20:33 +01:00
Topi Reinio
31c4ad1686 coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc to a version that queries system include paths from the
compiler, avoiding spurious documentation warnings in some environments.

Update qtattributionsscanner to a version that fails the documentation
build on incorrect input, i.e. incorrectly formatted qt_attribution.json
files.

Pick-to: 6.4
Fixes: QTBUG-108353
Change-Id: I3a64f7810cddafcbf9de66bd1d848c18f5677ad0
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-11-17 19:20:31 +00:00
Jani Heikkinen
f1f5b612ff Enable CI for qtquickeffectmaker.yaml
Task-number: QTBUG-108162
Change-Id: I39fe28ba6eb8e65ef5c4c3d08343ff72f349bd22
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2022-11-16 12:43:06 +02:00
Alexey Edelev
8f6cdc23be Add Android Multi-ABI CI preset
Add the minimal test preset for Multi-ABI Qt for Android.

Change-Id: Ic534daa5cea823b08b718f43ece637f9f9b375d9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-15 14:08:39 +02:00
Heikki Halmet
2a7c08f591 Provisioning: Remove MSVC 2019 build tools update
Running vsinstaller twice seems to cause problems. Second installation
get stuck and it can't be used again. Seems like somethin get corrupted.

Pick-to: 6.4 6.2 5.15
Task-number: QTQAINFRA-5090
Change-Id: Ic638879ea2f70bc74c028bff24daceb50e98480d
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2022-11-15 09:48:23 +00:00