Commit Graph

62 Commits

Author SHA1 Message Date
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
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
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
Simo Fält
a992ba9205 Provisioning: Remove git installation from macOS 10.14
The script uses homebrew which does not support 10.14 anymore and it
fails. The git was installed due to Conan, but with TestOnly config
it does not need git.

Task-number: QTBUG-105554
Pick-to: 6.2 6.3 6.4
Change-Id: I542780d32ebd7054c75a6afa357b3fac898b93cb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-08-12 07:34:55 +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
Heikki Halmet
e5b819e26d Disable Software Updates for macOS
Pick-to: 6.3 6.2 5.15
Change-Id: Id80d66cfebaa17311d7bfd927f3ce33ba0b81661
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-05-03 08:33:22 +03: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
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
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
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
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
Assam Boudjelthia
286a294daf Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Pick-to: 6.2
Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2021-10-29 15:08:36 +00: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
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
Assam Boudjelthia
6ac98447b5 Coin: bump Android build tools and platform sdk level from 29 to 30
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).

Ideally, build tools should be kept up to date as well anyway.

Pick-to: 6.2 5.15
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2021-08-26 07:54:17 +00: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
Assam Boudjelthia
53220710f5 Update build tools and platforms API level to 29
Windows and macOS hosts were still using 28 while Linux uses 29.

Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-01 07:50:45 +03:00
Dan Ackers
2cee9da977 Libusb coin provisioning
Include libusb to linux, macos and windows

Pick-to: 6.1
Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-05-20 10:57:03 +03:00
Heikki Halmet
4e09a6db79 Provisioning: Remove mac certificates and signing tools
Those will be provided by Coin

Pick-to: 6.1
Pick-to: 6.0
Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff
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-04-22 08:44:07 +03:00
Assam Boudjelthia
53fc7d424d Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 12:19:04 +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
Heikki Halmet
26c97222c1 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Pick-to: 6.1
Pick-to: 6.0
Pick-to: 6.1.0
Pick-to: 5.12
Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-11 15:28:55 +00:00
Samuli Piippo
5fba592288 Remove old QNX provisionings
QNX 6.6 and 7.0 are not needed since they don't support Qt6.

Change-Id: I56d71bbebf421d1a5d952815878217b0bfdc85b2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 07:18:50 +02:00
Heikki Halmet
c84925c512 Provisioning: Reset Time Zone for macOS 10.14
Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ba149a162b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-06 04:36:07 +00:00
Heikki Halmet
61d69b068f Provisioning: Upgrade Xcode to version 11.3.1 for macOS 10.14
Xcode 11.3.1 is the latest supported version for macOS 10.14
It seems that in macOS 10.14 xip-package can't be expanded
through mount. It need to be fetched first.

Pick-to: 6.0
Pick-to: 6.1
Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-06 06:36:01 +02:00
Toni Saario
db7926c715 Disable network LSO/TSO on linux and macOS VMs
LSO/TSO causes problems handling network packets and deteriorates the
network speed to below 1MB/s.

Task-number: QTQAINFRA-4241
Change-Id: Ib999035668eefe51d59715c9a18f42c9e3dfdf21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-05 17:49:51 +00: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
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
aee06febca Provisioning: Install Ninja binary
Install Ninja binary without using brew

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3954
Change-Id: I2f50814e26e756bbf5cf3d74a4a1c5c00426ab4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-08 21:31:29 +03:00
Heikki Halmet
e3600116b3 Provisioning: Update Android ndk and build tools
Task-number: QTQAINFRA-3846
Change-Id: I5d3c0efce86e3b8bc3c6070ed4a9e438647bb955
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-08 14:52:22 +03:00
Jędrzej Nowacki
015c86534c Enable use of sccache in the CI
The sccache may significantly reduce build times.
We need to evaluate real cases to see how much is to gain.

This patch enables sccache only on cmake, exluding one msvc target
with debug flag -Zi, which creates separate debug symbols.
Related sccache issue:
  https://github.com/mozilla/sccache/issues/242

Task-number: COIN-130
Done-with: Aapo Keskimolo <aapo.keskimolo@qt.io>
Change-Id: Ic1f599c5194bcdee9528a548dabead1097821cd1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-19 12:59:16 +03:00
Heikki Halmet
c1b06ec3e5 Provisioning: Renew iPhone signing tools
Task-number: QTQAINFRA-3434
Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-08-14 09:39:03 +03:00
Liang Qi
029cabb729 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I57f8a62c4f146cd1eda26885ce1507c072cb107f
2020-07-02 11:22:30 +02:00
Heikki Halmet
30714c7cb7 Provisioning: Install Node.js
Node.js is needed by QtWebengine

Task-number: QTQAINFRA-3729
Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 122cf4cc0e)
2020-06-10 20:50:30 +03:00
Heikki Halmet
122cf4cc0e Provisioning: Install Node.js
Node.js is needed by QtWebengine

Pick-to: 5.15
Task-number: QTQAINFRA-3729
Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2020-06-09 20:58:09 +03:00
Liang Qi
c1c44574f6 Merge remote-tracking branch 'origin/5.15.0' into 5.15
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
	coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
	coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1

Change-Id: Ic7ed52251573824595821c53025323287d60b536
2020-05-28 10:22:03 +02:00
Heikki Halmet
16ca898568 Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1
Still includes ICU 58

Task-number: QTQAINFRA-3537
Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-05-22 14:09:47 +03:00
Alexandru Croitor
3652f77aa3 Provisioning: Set macOS locale to "en_US.UTF-8"
The 419f42903154489e2dace8d1eba183036275448b commit in qtbase
introduced a regression where the tst_fusion test in qtqtuickcontrols2
hits a deadlock while trying to print a warning about a non-UTF-8
locale.

The warning is due to the fact that the agent executed in Coin's VM
does not have an explicit locale set, and thus it defaults to "C".
There is no explicit locale set in any .bashrc (or similar files),
and neither in any launchd configuration (because the agent is
executed at macOS startup via launchd).

The deadlock is due to trying to acquire the same lock twice while
trying to write output to stdout.

The test only deadlocks on CMake configurations, and not qmake
configurations, because Coin has a hardcoded instruction to set the
locale to UTF-8 when running qmake tests.

Until the deadlock situation is addressed in another change, the issue
can be fixed by setting the macOS configuration locale to UTF-8
explicitly, by assigning the LANG environment variable
into ~/.bashrc at provisioning time, like we do with other environment
variables like PATH.

Fixes: COIN-578
Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-05-07 21:52:16 +02:00
Heikki Halmet
71043ca243 Provisioning: Update expired QNX license
Task-number: QTQAINFRA-3708
Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-04 14:41:54 +03:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Heikki Halmet
61267a7a78 Provisioning: Remove notifications and warnings from macOS
Notifications and warnings in UI might affect RTA and autotests results

Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2020-04-14 14:21:19 +03:00
Liang Qi
08e63423e2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/flashing-wizard.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/tqtc-qt-config-gui.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
2020-02-28 13:49:10 +01:00
Dimitrios Apostolou
d84b366d55 Silence the sdkmanager progress bar on macos
The exact same method is already in use on all Linux provisions,
it was just copied to macos.

Change-Id: I873f6efd99b147c5364e0dda6c26c7dad7dee480
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:57 +01:00
Dimitrios Apostolou
c0033df4b9 Execute a specific version of homebrew install script
Also first try to download it from local mirror.

This install script appears to be doing a lot of git-cloning and downloading
itself though, so it is still far from the ideal solution: to only download
from locally cached endpoints.

Task-number: QTQAINFRA-3134
Change-Id: I32131045d6e62f302ec666b4ac055ca5ee9662d5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:35 +01:00
Heikki Halmet
fd7bfcc0c5 Provisioning: Update signing tools for macOS
Update expired certificates

Task-number: QTQAINFRA-3540
Change-Id: I21e718901cb3f5c901273c0c122430f5caaea3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 05:08:31 +02:00
Simon Hausmann
4d0a52ddbf Prospective fix for broken cmake builds on 10.14
Add missing dependencies that were there on 10.13.

Change-Id: I1d81e9f50a83486784bef02bf904e3e8c53c4f11
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 22:32:15 +01:00
Alexandru Croitor
431eb132a9 Provision Ninja for macOS 10.14 template
Change-Id: I62ad67561de3459fe1a09e645dcc9b40dd2dbb1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-02-12 13:11:03 +01:00
Heikki Halmet
9e834b7651 Provisioning: Update Xcode to 11.3 for macOS 10.14
Task-number: QTQAINFRA-3189
Change-Id: If16062254b33579b14f141d1db4aca2ad1e23afb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-04 19:48:32 +00:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-11-18 14:23:08 +02:00
Tor Arne Vestbø
6bf7a970e7 Use Xcode 11 on macOS 10.14
Fixes: QTQAINFRA-3261
Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:04:33 +00:00