Commit Graph

135 Commits

Author SHA1 Message Date
Tor Arne Vestbø
969309c09e Fix shellcheck warnings in set_tcc_permissions.sh
Change-Id: I6b4de6e02e92d4c85fbb58cb1573a0ab3a178b24
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0a8f1050f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-04-21 07:33:28 +00:00
Artem Dyomin
26a71457ae Implement dynamical ffmpeg linking on macOS
* fix dependencies and install names (absolute => relative)
* fix compilation build of dylib on xcode 15.
* add matching build instructions to yaml.
* old macos versions don't have 'realpath', workaround is used.

Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I22e413d8f6d05c8c7d6d09a5926691216e781fd3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
(cherry picked from commit a53b63019f)
2024-04-20 08:39:40 +02:00
Tor Arne Vestbø
7c9b1a44d5 coin: Give bootstrap-agent permission to use microphone on macOS
The bootstrap-agent is the 'responsible process' in TCC terms when
it comes to whether a test should be allowed to access the microphone.

 https://www.qt.io/blog/the-curious-case-of-the-responsible-process

By giving this process the permission explicitly, by modifying the
TCC database, we ensure that all tests run as child processes also
get this permission.

Change-Id: Ia03084ac89f0717ac6457b0035769f4a9863495b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit b4de4de742)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-04-02 15:06:33 +00:00
Artem Dyomin
0abefd8bba Retain symlinks upon making universal macOS binaries
Saving symlinks is important when we build dynamic libs,
it will be needed for building QtMM + dynamic ffmpeg.

Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I58c040a81f1fa6a3b316ace864fda0687415fd0a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 231d089553)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-02-14 09:19:46 +00:00
Artem Dyomin
fbae0d81d6 Revert "Retain symlinks upon making universal macos binaries"
This reverts commit a3c489b272.

Reason for revert: Mistakenly replaced 'set -e' => 'set -x' just hides the problem on macOS 11 and 12. The patch needs to be investigated again

Change-Id: I238395fd2ae1fc362a0c9af02e2d48acce22e0dc
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit f87f27dc62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-30 09:57:08 +00:00
Artem Dyomin
6d425779cf Retain symlinks upon making universal macos binaries
Saving symlinks is important when we build dynamic libs,
it will be needed for building QtMM + dynamic ffmpeg.

Pick-to: 6.6 6.5
Change-Id: Ic356a9c3df727a1afe14e8553728952d3b106ba3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit a3c489b272)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-24 18:04:03 +00:00
Elias Toivola
bf09d0fe5b Update Android NDK to version r26b
Revision 26.1.10909125. Also prebuilt OpenSSL 3.0.7 with it.

Task-number: QTQAINFRA-5771
Change-Id: I0dbe1f2d38f277bcb805f5b7ac1f30e25aabd1f8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit 782e1700cf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-12-23 21:30:03 +00:00
Alexandru Croitor
bae2268c47 CMake: Update provisioned CMake to version 3.27.7
We want access to the debugger, and also to be in sync with the CMake
shipped with the Qt SDK.

Task-number: QTBUG-118138
Change-Id: I4b43b9543e8e6ef23c9608a8e1c623ee16edfbd5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-11-15 09:14:29 +01:00
Casimir Saastamoinen
23116e7331 Configure pip for internal cache
Task-number: QTQAINFRA-5531
Change-Id: I89c5502f62b2777a06b8f301a9fbaca1a3f8859d
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-11-05 12:06:07 +03:00
Amir Masoud Abdol
1fd6fb3565 Provisioning: Mount Vcpkg Cache Drive on macOS
Change-Id: I3038467c98a7c2a5f3b05d7b370d9ec0ea95156d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-11-05 10:05:59 +01:00
Tony Sarajärvi
070b3bf26e Remove unused variable from mimersql.sh
Change-Id: I1f77dfcac4988c0e377b68b9d6b85cf265869aea
Reviewed-by: Fredrik Ålund <fredrik.alund@mimer.com>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-11-05 09:05:43 +00:00
Fredrik Ålund
b073e4c5d8 Mimer SQL: Do not unpack directly to /usr/local and use sudo
Unpacking the Mimer SQL universal binary package fails on macOS 14-arm.
Do not unpack directly to /usr/local and use sudo. Verify that all
directories exist.

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: I5f1bf3413103c07a94a47b5421c41b8b1234ca22
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-10-20 05:31:03 +00:00
Fredrik Ålund
3d354bf9c0 Add universal binary for Mimer SQL on macOS
Do not use the Mimer SQL installer on macOS since it is not universal.
Instead, use an archive with the needed library and include files.
Use a universal binary on all macOS version from 11 and up.

Fixes: QTBUG-111219
Pick-to: 6.6
Change-Id: I4a3716b1207ee966f36e977fe5f9d1016fb9efcb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-10-13 09:55:21 +02:00
Ville-Pekka Karhu
2a7c5cdf71 Provisioning: A better fix for enabling zsh history
Change-Id: I089ae9ea42b51b66009c1e2c50910ea689500aa1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-10-09 09:10:15 +03:00
Fredrik Ålund
1927326833 Install Mimer SQL on macOS
Mimer SQL is needed to build the QtSql Mimer SQL plugin.

Fixes: QTBUG-111219
Change-Id: I678c095068fd096f8632f9cdbb00b1bdf96bbe45
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-10-07 06:44:51 +00:00
Ville-Pekka Karhu
8e5e4d5e2c Provisioning: Fix for enabling zsh history
Change-Id: I9b1af1f99181a7b1c0a4acded4022a26fbf5a641
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-10-03 08:16:19 +03:00
Elias Toivola
b105bbaab1 Provisioning: Bump sdkApiLevel and sdkBuildToolsVersion to 34.0.0
Task-number: QTQAINFRA-5691
Change-Id: I4c0f92a53165f316da4b69161f0ec7cb6f889167
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-09-14 05:04:47 +00:00
Tony Sarajärvi
620666bce4 Fix shellcheck complaints about provisioning scripts
Also adds executable attributes to shell scripts that were missing it.

Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2023-09-13 06:44:02 +00:00
Lucie Gérard
ae21de72f3 Add license header to provisioning scripts missing one
Task-number: QTBUG-108364
Pick-to: 6.5 6.6
Change-Id: I5b1d53aad917ed38f9e26e1fcc1b97b921c0603a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-08-31 16:25:43 +02:00
Casimir Saastamoinen
949594ef83 Give qt user access to zsh history and transfer .viminfo under qt user
Task-number: COIN-723
Change-Id: I093ba09ffc3b7500ace71b4752f17015859989c7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-08-29 09:58:57 +03:00
Aku Pietikäinen
2de9e59be6 Provisioning: macOS 14 x86_64 support
Change-Id: I369beb7a790fbb94bf2c1e9a823734434ea3b3da
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-08-16 16:06:23 +03:00
Ville-Pekka Karhu
6f24602eb4 Provisioning: Add macOS 14 ARM support
Task-number: QTQAINFRA-5643
Change-Id: Ie98a77063c59033ccffa397aca4dbc349e624450
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-28 11:14:26 +03:00
Dominik Holland
b87b44168c Provisioning: Remove the special wheel cache for python3 packages
It should be replaced with a global pip cache in the long run.
Removing it should make the maintenance of the required packages easier
as it can be done within the modules instead of in the global
provisioing scripts.

Pick-to: 6.6
Change-Id: Ief9832a8a640ce98325cda015d0a9e89d6cb16af
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-07-25 15:52:51 +03:00
Allan Sandfeld Jensen
d764e8fe39 Update node.js on Linux/macOS
Qt WebEngine 6.6 need 14.19+

Pick-to: 6.6
Change-Id: Idf2d54fcdc55762cd9d8cfe5248858bd00afe89c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-06-20 11:32:44 +02:00
Lucie Gérard
eecfb19548 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.5 6.6
Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-06-12 12:10:41 +00:00
Tony Sarajärvi
58ddf7133c Correct the domain of ci-files01-hki
It's hasn't been .intra.qt.io for quite some time, it
has worked through an alias we have on the DNS server.

Change-Id: I0bc17668dacfea64c276bb553e75e4be16e97659
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-06-12 12:10:26 +00:00
Heikki Halmet
d5ba87dff6 Provisioning: Use Docker registry when pulling images in macOS
Task-number: QTQAINFRA-5428
Pick-to: 6.4
Change-Id: I0034922dd7cc42b55b3c1e852070df29a54c529b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-02-26 14:58:55 +00:00
Assam Boudjelthia
8abebe23ef Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13.

Pick-to: 6.5
Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-20 11:45:02 +02:00
Heikki Halmet
e266a9e604 Provisioning: Add Docker for macOS
Needed by RTA tests

Pick-to: 6.5 6.4
Task-number: QTQAINFRA-5171
Change-Id: I26ac10421ba32d68ffdef523fd97f710cd6bcaab
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-01-12 12:28:47 +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
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
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
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
Simo Fält
c58560db14 Provisioning: Disable application reopen after reboot
This is required with physical Mac machines.

Task-number: QTQAINFRA-5094
Change-Id: Ic1fad436d76d04e1dbce778f57bb69d8124548e7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-06 09:11:04 +03:00
Tor Arne Vestbø
d3867057b9 coin: Install local Homebrew formulas explicitly as formula
Otherwise we end up with scary warnings like:

Error: Failed to load cask: ./coin/provisioning/common/macos/libiodbc.rb
Cask 'libiodbc' is unreadable: wrong constant name #<Class:0x00007fb4f589d2d8>
Warning: Treating ./coin/provisioning/common/macos/libiodbc.rb as a formula.

Pick-to: 6.4 6.3 6.2
Change-Id: Ief1b78c70367c740ce7eeca9110c3cf41372f53a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-08-29 01:01:00 +02:00
Ville-Pekka Karhu
c310e97097 Add provisioning for ARM macOS 13 beta
Task-number: QTQAINFRA-5066
Change-Id: I0ff36bea066b51e086b10b817769ca3f22190201
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-08-23 09:45:37 +03: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
Simo Fält
bfc49c207d Provisioning: Update cmake to 3.21.3 to enable Android build
To avoid https://gitlab.kitware.com/cmake/cmake/-/issues/22634.

Pick-to: 6.2 6.3
Change-Id: I1227218514174843353b5bd5d831d89ed1ca89b4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-04-04 23:16:47 +03: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
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
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
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ø
881738a01d coin: Add PostgreSQL 14 to macOS 11 images
Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Pick-to: 6.2 5.15
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-12 11:18:20 +01:00
Heikki Halmet
ba32df291c Provisioning: Change cache url suffix ci.local to intra.qt.io
Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-29 09:51:48 +03:00
Simo Fält
ea89779e22 Provisioning: Update Python in macOS to 3.9.6
Pick-to: 6.2
Change-Id: I092513727642b34cc71034dab96c78eaecfe72f1
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-10-20 19:51:04 +03:00
Heikki Halmet
abd2e0b381 Provisioning: Upgrade Java JDK to version 11
Pick-to: 6.2
Task-number: QTQAINFRA-4596
Change-Id: I5c67f220b5a1f3115032eb509d1d391cf1e520a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-15 09:51:01 +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
Alexandru Croitor
9218d50a6e CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Pick-to: 6.2
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-06 20:30:36 +02:00
Alexandru Croitor
e8b0be7711 Provisioning: Install ninja 1.10.2 for Windows and macOS
To avoid error 'too many path components' when building Qt on Windows.

Pick-to: 6.2
Task-number: QTBUG-95286
Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-23 10:18:23 +02:00