Commit Graph

1720 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Oliver Wolff
bc4797a7e8 provisioning: Check successful installation of MSVC 2019 update
Using vswhere we can make sure if the MSVC 2019 update finished with the
right version. For further safety we check, if the installation is
complete and launchable.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I90e84bf4922647b4ff30ba93a207b9d5e1a96120
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-11-10 06:49:32 +00:00
Oliver Wolff
37f4d821b8 provisioning: Make sure that MSVC 2019 version is added to versions.txt
If MSVC 2022 is installed in CI machines, vswhere -latest without any
additional version information will return the latest version of 2022.
By limiting the version range (>=16, <17) we make sure that only the
latest version of MSVC 2019 is returned.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I8f92099f030660c1914ffb728efc9a55eadf4808
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-10 06:49:29 +00:00
Artem Dyomin
bc5662c050 Fix ffmpeg build on windows CI
Ffmpeg was not compiled because of failed yasm installation
on msys2. The installation failed due to checking pgp signatures.
Current fix adds keys refreshing that fixes the problem (checked
on CI and on local machine)

Note, currently the ffmpeg build works with msvc and mingw,
additional settings for llvm should be added in next commits.

Build example:
https://testresults.qt.io/coin/integration/qt/qtmultimedia/tasks/web_qt_qtmultimedia_1667916985085

Pick-to: 6.4
Change-Id: Iff305e896bfb382c0c4030235cc2ad942cbbc002
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2022-11-10 05:36:11 +01:00
Heikki Halmet
20c8f11006 Provisioning: Update Xcode version to 14.1
Command line tools are also updated

Pick-to: 6.4
Change-Id: Ic1d0882d395e014a4f33ed139c90800b3ba71cbf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-11-09 06:08:20 +00:00
Assam Boudjelthia
b7ea626a07 Add Android 12 emulator for CI testing
Add Android 12 emulator to make sure tests are verified
on a recent Android release. Android 12 has only x64 emulator
version from sdkmanager and x86_64 is better in any case.

This patch only adds the emulator, but doesn't enable its use,
that is done under another patch.

Task-number: QTQAINFRA-4748
Task-number: QTQAINFRA-4733
Change-Id: Ic1569fb1afa5b2d02e6eadea1d9a8eac0a378d98
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-09 06:08:17 +00:00
David Skoland
4a6f43ed8d wasm: Add actual emscripten installation to path in coin
I'm not sure where the emscripten-$version came from, maybe that's
how it used to be? In any case, in the current version (3.1.x),
the installation folder is in upstream/emscripten, so add PATH
there to access all emscripten utils.

Pick-to: 6.4
Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-11-09 07:08:15 +01:00
Heikki Halmet
9c21dd75d2 Add openSUSE LEAP 15.4 (KDE) to CI
Graphichs Platform: X11 (System default) in image with suffix 50
Graphics Platform: Wayland (Plasma (Wayland) in image with suffix 51

Pick-to: 6.4 6.2 5.15
Task-number: QTQAINFRA-5049
Change-Id: If4b208bc12bd272c757aac61ffc9ef7a88df8f7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-11-04 15:31:36 +00:00
Heikki Halmet
1a91aa20ac Provisioning: Fix for checking the installed Android openssl version
Pick-to: 6.4
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-02 07:06:24 +00:00
Heikki Halmet
2fb9e7d576 Pre-provisioning RHEL9: Make needed changes for autotest
* Disable all notifications
* Disable Hot corner and windows key from showing the GNOME
Shell Activities overlayfeature.
* Switch to use GNOME Classic: Autotest start failing because
terminal session remains in Activities Overview when using
Standard (wayland display server)

Task-number: QTQAINFRA-5111
Change-Id: Id0cd7e53cfad08313b9c0b622f2f9de8240448f3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-01 08:32:56 +00:00
Heikki Halmet
c90e16bceb Provisioning macOS 13: Upgrade Xcode version to 14.1_Release_Candidate_2
This will also upgrade Command line tools

Change-Id: I9425170ceb2f09ec74fdb70ab6101804aa1d31fe
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-10-27 11:26:33 +00:00
Tony Sarajärvi
da78e8832d Update LLVM MinGW to 15.0.0
Task-number: QTQAINFRA-5214
Change-Id: I5ae09182dfbafdeaa8d23acf3d7c9cca0ca5f108
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-17 19:47:14 +03:00
Mårten Nordheim
cfef190a9d Remove protobuf provisioning for x86 windows
Since it's not used in any way for building Qt and breaks
provisioning where it is used.

Change-Id: Ib20e24274498c8b55658ac409f9644ce3c598864
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-17 18:47:12 +02:00
Matti Paaso
936ede45de Update Android NDK to version r25b
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-17 19:47:10 +03:00
Ville-Pekka Karhu
3ffc302ca2 Provisioning: Update to Xcode 14.1 beta 3 on macOS 13 ARM
Change-Id: If7cacf8118fff3e7e14d4cad68c886732d54d4c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-13 13:32:50 +03:00
Joerg Bornemann
53cb7139be Provisioning: Install patchelf on openSUSE 15.3
On this platform we test CMake 3.16, and for that we need the patchelf
tool.  Otherwise, the CMake deployment test will fail when trying to
set rpaths.

Change-Id: I2418390ba0776a19c5ab19042f3b8c4e12db6ecb
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-10-12 07:03:03 +02:00
Ville-Pekka Karhu
eee152ca70 Provisioning: Update to Xcode 14 on macOS 12 Intel
Change-Id: I95e0c590b74f14aec4fd16a104e429a64c442414
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-10-11 14:16:29 +00:00
Heikki Halmet
9255466d9f Provisioning: Use OpenSSL 3 version with Red Hat 9
OpenSSL 3 is default version when installing OpenSSL with yum. We need
to use OpenSSL 3 also with Android

Change-Id: If283c68d00d9a41131044fe245b5e84b39fd4744
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-11 17:16:18 +03:00
Tatiana Borisova
52d2df3a61 Update GHS compiler version to v2022.1.4
- the latest patch_20196 (UTF-16 fix) is applied

Pick-to: 6.4
Change-Id: I0324c635b594f2a79604a36f962cca82e8a5de97
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-08 18:31:13 +03:00
Liang Qi
eee7fde8a8 Provisioning: Install xcb-cursor libs and headers on RHEL9
This amends e679091f50.

Task-number: QTQAINFRA-5067
Change-Id: Ie3b6311944868022087be8cc56fdc66c53b95a44
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-10-06 12:47:20 +02:00
Edward Welbourne
74fc1bcaec Remove stray first line from provisioning script
Having a blank line before the shbang makes the shbang not work.

Pick-to: 6.4
Change-Id: I523c4eab8746da2b898eacf3f54f73d63dbd2786
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-28 18:38:03 +02:00
Liang Qi
b5bd0f1871 Remove TestDocs in Ubuntu 22.04 nightly build
qdoc_qtattributionsscanner was also removed.

When we have TestDocs in the future, we need to rebuild
qdoc_qtattributionsscanner for Ubuntu 22.04.

Task-number: QTBUG-106948
Change-Id: I56bfda453cfddae97fa03b2a5eca91548152afe5
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-09-26 15:17:31 +02:00
Ville-Pekka Karhu
0c92132388 Provisioning: Rename macOS ARM folders
Change-Id: Ic70b6d56e84f5ae4718d1dc9edaed64abbbc3735
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-26 15:11:25 +03:00
Heikki Halmet
825736dd7a Update Git version
We need newer ssh for RTA use. Current version has problem with
ConnectTimeout:
https://github.com/PowerShell/Win32-OpenSSH/issues/1352
Latest git version comes with OpenSSH version 9.0p1 from which this
should be fixed.

Pick-to: 6.4 6.3 6.2 5.15
Task-number: QTQAINFRA-5038
Change-Id: I5aac1db22b1145163ee947537b363a94b86d094d
Reviewed-by: Timo Lahti <timo.lahti@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-09-24 11:10:27 +03:00
Johanna Äijälä
db68763094 Provisioning: Add Java 11 to Ubuntu20.04
Needed by RTA when compiling Android applications, minimum required
Java is 11.

Pick-to: 6.4
Pick-to: 6.3
Pick-to: 6.2
Change-Id: I9a64e8de322a576d5d94593b5666d72afea8744f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-24 11:10:25 +03:00
Ville-Pekka Karhu
c1a1e65cdc Provisioning: Xcode update to ARM macs
Change-Id: I71828f5b126c6243163238aef2000dfb91cdbcb2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-23 12:50:27 +03:00
Liang Qi
7e7c23669c provisioning: fix mdns to support both docker and network tests
Network tests require the system resolver to resolve IP addresses
back to host names, but "mdns4" seems to be unable to do that, and
instead prevents "dns" from doing its job. So we place it after "dns".

Done-with: Dimitrios Apostolou <jimis@qt.io>
Done-with: Thiago Macieira <thiago.macieira@intel.com>
Fixes: QTBUG-106013
Change-Id: If0379cf5f42b41964cf156cdf8691dbcfcc0275b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-09-23 06:23:55 +00:00
Heikki Halmet
bf1c196e41 Provisioning: Install Node.js for SLES 15
WebEngine requires node.js version 12 or later

Pick-to: 6.4 6.2
Change-Id: I9ff5ebbfcaf328445149e6d0b95e02dd0febf5c3
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-09-21 12:58:53 +03:00
Heikki Halmet
8a72b1de99 Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-20 10:30:05 +03:00
Heikki Halmet
911505cd37 Provisioning: Fix Protobuf installation for Ubuntu 22.04
Cmake environment variable need to be read from .bash_profile
(or .bashrc) instead of .profile with Ubuntu 22.04

Change-Id: Ic0589666e48946ba05366304407a0e5824b27a2c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2022-09-20 07:30:03 +00:00
Mårten Nordheim
0770d0db8f Update protobuf script for macos 13 arm
Amends ad84c5cb8a and
134c07923c

Change-Id: Ia0f63d4e2cfe106c4ddfa63fe98609209e7a3b78
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-13 10:24:38 +02:00
Topi Reinio
505eb9e3a8 coin: Update provisioned qdoc, qtattributionsscanner binaries
Latest qdoc introduced a new command (\modulestatus) as well as other
fixes and improvements.

Pick-to: 6.4
Change-Id: Idcbd96bc1ec17c81d51c2413f6435ee1b7e12946
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2022-09-12 10:14:34 +02:00
Heikki Halmet
1661a1c50c Fix link to common protobuf script
Protobuf script name was renamed recently

Change-Id: I9bafc35524a5bf89ca5d91b7649eb6641845792c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-09-12 10:01:49 +03:00
Heikki Halmet
1a499546a3 Add Red Hat 9.0 to Nightly Builds
Task-number: QTQAINFRA-5111
Change-Id: I4f3871795a663f479d7a417405c48635725fdcae
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-09-08 15:56:44 +03:00