Commit Graph

130 Commits

Author SHA1 Message Date
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
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
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
Alexey Edelev
134c07923c Rename protobuf provisioning scripts
Use correct protobuf project name for provisioning scripts.
This also should trigger provisioning for all the involved platforms.

Change-Id: I4cfa74c1d41f497db528ee3ae152db1d51de821a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-09-08 10:27:57 +02:00
Alexey Edelev
ad84c5cb8a Update protobuf provisioning scripts
Enable protobuf provisioning for all linux platforms, since it's
required to build qtbase with protobuf support.

Delete install_protobuff for macos 10.14 since it's not used and
wouldn't build without special casing.

Change-Id: I9c7dea876c45dbcbfc3110b106ae683bbe9179ec
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-08 10:27:54 +02:00
Johanna Äijälä
6754cb362a Provisioning: update Squish 7.0.1
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.

Pick-to: 6.4
Pick-to: 6.3
Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-04 07:04:51 +03:00
Tor Arne Vestbø
ffd7bc3bd7 coin: Prepare for removing macOS 10.14 as a supported deployment target
Change-Id: I9fcee3df2d9bfeb8f920df8a30e3e1b556874fd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-28 23:01:28 +00:00
Heikki Halmet
73234745bb Add Ubuntu 22.04 to Nightly CI
Targets will be non-blocking and only in nightly run for now

Task-number: QTQAINFRA-4926
Change-Id: I7b229c1ccc34da4f1843dac3c25e19f7df819489
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-08-23 07:56:38 +03:00
Simo Fält
e8495fc86e Add wrapper for sccache command in Linux and macOS
The sccache tends to fail every now and then. Adding a wrapper
which calls build tools directly if first call with sccacche fails.

Task-number: COIN-740
Pick-to: 6.2 6.3 6.4
Change-Id: Ic03cf991da585d1569387118183763497ea73b72
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-08-12 07:45:00 +00:00
Piotr Srebrny
51c663d171 Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS.
The FFmpeg libraries are installed under /usr/local both for Linux
and macOS.

Since macOS x64 does not have the lzma lib for arm64 architecture
installed by default, I disable this libraries for FFmpeg. This
only affects the TIFF image decoder that we do not use.

Added the execute permission to the ubuntu scripts.

Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-07-28 09:56:16 +02:00
Lorn Potter
b6b127c2d9 wasm: update emscripten version to 3.1.10
Qt 6.4.0 will require emscripten 3.1.10

Change-Id: I9411902674104aae8f4ba3b6af11e9956932d6b9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-05-27 08:31:33 +10:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Morten Johan Sørvig
53493a2351 wasm: upgrade emsdk version to 3.1.6
3.0.0 has a critical bug which can cause linking failures
(see QTBUG-101267). Update to the most recent version
where the bug has been fixed.

Task-number: QTBUG-101267
Pick-to: 6.3
Change-Id: Ib2e6abb72eb50b77db63175bbbf4a88b5e3c3920
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-03-12 16:10:12 +00: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
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
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
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
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
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
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
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
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
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
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
4d617e24ee Add provisioning scripts for macOS 11.0 ARM
Task-number: QTQAINFRA-4263
Task-number: QTQAINFRA-4012
Pick-to: 6.2
Change-Id: Ia862ac2582912f6faa96667880fb605861c770c6
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 13:14:16 +03:00
Tor Arne Vestbø
f8fab3be9b Improve OpenSSL provisioning on macOS
- Make the script idempotent
  - Use local architecture instead of hard-coding x86_64
  - Set deployment target to 10.14
  - Improve logging by not building with --silent
  - Don't install manual pages
  - Allow custom install prefix (for testing)

Pick-to: 6.2
Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-11 08:16:52 +02:00
Tony Sarajärvi
e0eb04ecf8 Add execution attribute to provisioning scripts
Change-Id: Ia241a4211d24d2788f0f0ef9af55b23a6b227624
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-07-01 15:40:33 +03:00
Tanja Remes
1c17b656e0 Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Pick-to: 6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-22 06:04:53 +00:00
Tor Arne Vestbø
ab78fc3c52 coin: Provision OpenSSL as universal build for macOS
Fixes: QTBUG-93205
Change-Id: Ic1f4d7709139da06cdd05605613602c1b28306b6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-07 16:08:20 +02:00
Joerg Bornemann
43f3795125 wasm: Add WebAssembly platform to Coin
Change-Id: Ia377ad7ff8a675e80ead78eaf47848cc0f235247
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-19 19:14:15 +02:00
Cristian Adam
c653958301 Update QDoc libclang to 12.0
Task-number: QTBUG-93203
Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-30 14:37:00 +02:00
Heikki Halmet
0e9f489192 Provisioning: Upgrade OpenSSL version to 1.1.1k
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-26 12:56:01 +00:00
Heikki Halmet
aa5112af99 Add Red Hat 8.2 to CI
Red Hat 8.2 is the latest version with extended update
support. In the end Red Hat 8.2 will replace CentOS 8.3

Task-number: QTQAINFRA-4322
Change-Id: Iaa2ef452e7e6608349ba7438bbc5d25ddb35fa2a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-20 08:38:20 +03:00
Johanna Äijälä
03821e82a5 Provisioning: Fix Squish for Qt6 on macOS
Add correct Squish package to the 'squish_for_qt6' location.

Pick-to:6.1
Pick-to:6.0

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-20 04:44:11 +00:00
Toni Saario
32579bc3c4 Add conan to path
Pick-to: 6.1
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:25 +00:00
Toni Saario
3802e21afe Enable conan revisions mode
Pick-to: 6.1
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:23 +00:00
Joerg Bornemann
cdc79cdfb9 provisioning: Make generated .emscripten look more natural
The WASM CMake port of Qt reads .emscripten and parses its content to
locate the emscripten root. We must bring our generated .emscripten
closer to what emsdk generates to prevent the parser from choking.

Change-Id: I5d17fb7679627ab3a7145f539f5a911fd227a6ac
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-04-01 09:05:20 +02:00
Lorn Potter
46918ee092 wasm: fix linux node path
Change-Id: I445f5c44dfa4de4d1f0825c3218c7975780134b8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-29 08:02:42 +00:00
Johanna Äijälä
02d4c34b7d Provisioning: update Squish packges
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.

Pick-to: 6.1
Pick-to: 6.0
Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-03-28 16:31:34 +02:00
Lorn Potter
7c26fecfaf Provisioning: Bump Emscripten version to 2.0.14
Change-Id: I6345cdc3ffef7f17fa75406a3816d1b59451a05a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2021-02-24 09:10:08 +10:00
Tor Arne Vestbø
100cfb3310 coin: Write provisioning environment variables to ~/.zshrc as well
The default shell on macOS 10.15+ changed to zsh, so we need to ensure
the environment variables are picked up by that as well.

Change-Id: Ib8c8d8017c0d22fdbbf429936876824d386d4f4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-08 11:29:32 +01:00
Cristian Adam
d3406fedd1 Update QDoc libclang to 11.0
Pick-to: 6.1
Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-02-05 18:49:51 +01:00
Johanna Äijälä
d86303a561 Provisioning: Update Squish for Qt6
These are snapshot packages from Froglogic, not available for macOS yet,
thus it will still use Qt5.15 based Squish. Only Linux and Win packages
are updated now.
Along with the Squish for Qt6 we need the Squish for Qt5 to be able to
run Creator tests (since Creator is still Qt5 based).

Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5
Pick-to: 6.0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-02 07:38:13 +02:00
Heikki Halmet
e67fa087db Provisioning: Install Conan package manager
Conan package manager is need for addtional libraries

Task-number: QTQAINFRA-4190
Change-Id: I5cb07a137505f15d536989c6d5127f607735a17e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-26 14:15:15 +02:00
Heikki Halmet
f6b0b21ba2 Add Big Sur macOS 11.0 to CI
Only one target is added because current HW capasity is minor.

Task-number: QTQAINFRA-3967
Change-Id: Iae2ac0e02b38b45a219a78e046fb21338ff9cd97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-22 10:35:11 +02:00
Heikki Halmet
8c32c1dcd7 Provisioning: Add libclang packages to cache
Both static and dynamic libclang packages are missing from our local
cache. Dynamic and static packages need to be in different folders
because package names are identicals

Pick-to: 6.0
Pick-to: 5.15
Change-Id: I0d4c0c776f1c5f318417cae6c16d683b31a10710
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-21 08:47:49 +02:00
Simo Fält
b792fd56db Provisioning: Install libClang 10 with dynamic libs
As Qt uses only static archives of libclang, we have to install
dynamic version as an additional package. Libclang is required
for example QtForPython.

Pick-to: 5.15
Pick-to: 6.0
Change-Id: Ic9d70398113defe3561f261aee369b423c18686a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-23 08:02:32 +02:00
Heikki Halmet
b34fa5f9cf Remove RedHat 7.6 from CI
CentOS 8.1 is now in CI without Insignificant flags so
Rhel 7.6 can be removed.

Task-number: QTQAINFRA-2760
Change-Id: Id797a6ea5bf9c4d64929b4d6e183d0c7146309ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2020-11-16 07:38:21 +02:00
Maurice Kalinowski
9a82a87954 Update MQTT test broker
Latest additions of CentOS cause troubles due to
- Updated SSL to set up tls servers
- Updated Python version, which removed API calls

For the latter, we only need to update the broker. TLS test servers
are not used in our setup. However, qtmqtt.git requires on further
update to load a different configuration.

Task-number: QTBUG-88189
Change-Id: I2d6e559a21dff41deca94aeec8c5db6fdf72a0ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-11-11 07:59:22 +01:00