Commit Graph

682 Commits

Author SHA1 Message Date
Heikki Halmet
686481f48c Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Pick-to: dev 6.3 6.2
Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-03-23 06:36:25 +02:00
Heikki Halmet
98f696ce30 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 96fe74b540)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-17 11:28:30 +00:00
Pasi Petäjäjärvi
ba761fab29 CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 339a47b4ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 19:06:55 +00:00
Pasi Petäjäjärvi
0ad4b8a794 CI: Add network autotests support for QNX
Add regular UNIX network related files to configure
used test network based around QEMU and docker
services. IP address 172.31.1.1 is bridge interface
address in host which QNX tool mkqnximage set
(hard coded intool, cannot be changed).
Docker service hostnames are configured statically
as mDNS does not work from QEMU.

Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 477877352a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 19:06:49 +00:00
Assam Boudjelthia
6aaa6ecfe2 Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a4cc949b8d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-10 19:29:57 +00:00
Toni Saario
e76d47cae9 Update git
Older git version does not allow fetching single specific sha1.

Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a2393b5882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-08 08:56:51 +00:00
Heikki Halmet
a7fed578ed Provisioning: Update OpenSSL to version 1.1.1m
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>
(cherry picked from commit 8732165461)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-16 18:47:59 +00:00
Heikki Halmet
51752c6b7d Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 88cde9e500)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 11:26:17 +00:00
Pasi Petäjäjärvi
40dfcecd4a CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 848a7d5fa3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:13:14 +00:00
Pasi Petäjäjärvi
8a8f1b7654 CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2592bbe8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:12:58 +00:00
Pasi Petäjäjärvi
c69258f175 CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4a5550cc03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-30 05:12:47 +00:00
Kai Köhne
efc8d985c6 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit becb423e80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-20 04:26:48 +00:00
Heikki Halmet
83d1af1b22 Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 9d09f9cee9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-17 15:47:53 +00:00
Pasi Petäjäjärvi
8f783c41aa CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cb9c1caef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:40 +00:00
Pasi Petäjäjärvi
5d3ac77196 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 10a443c181)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:32 +00:00
Pasi Petäjäjärvi
65a96ae8cf CI: Add inotify support for QNX
Adds Filesystem event manager server to image and also add HOME env
varbiable for root user.

Task-number: QTBUG-99168
Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 06edc60e1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 07:04:03 +00:00
Marianne Yrjänä
e9258230f3 QNX: Update QNX toolchain
Timezone database added for tests

Pick-to: 6.2
Change-Id: I406e1ae0e9d1553f1588413d9cd20920674a907c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-12-11 17:33:21 +02: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
Toni Saario
dcded49b88 Enable conan revisions mode
Pick-to: 6.2
Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
b2240d78cd Remove existing conan settings file
Due to existing conan file new versions of compilers etc. cannot
be used. Forcing Conan to generate a new one will allow using the
new versions in profile files.

Pick-to: 6.2
Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
5cf68160c2 Update conan on windows
This is required for the upcoming conan integrations.

Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Heikki Halmet
8f46d3ede3 Add Windows 11 targets and provisioning scripts
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-26 15:42:27 +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
Heikki Halmet
278516d142 Provisioning: Change using GitHub package for MinGW 11.2.0
Pick-to: 6.2
Pick-to: 6.2.2
Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 18:19:39 +02: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
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
Heikki Halmet
ab7d990ec3 Add temporary emsdk_env.bat for webassembly
Let's use this temporary hack so that we can get support
for setting Emscripten environment for Webassembly through qtbase

This change will be removed when we start installing emsdk using
emsdk.git. That installation process will automatically set emsdk_env.bat

Change-Id: I6eb417b28c9ca0cd01a743dea2fa38540fd4dcc3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-12 16:39:33 +02: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
30a1ea30a6 Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-09 09:01:19 +02:00
Pasi Petäjäjärvi
8d7f2db3a0 CI: Update QNX ICU libraries for QEMU
New QNX toolchain has updated ICU libraries

Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I36806c815410877998eb44bef60614bf824f15f9
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-30 11:37:10 +03:00
Heikki Halmet
f4f80d1b0f Provisioning: Update Integrity toolchain to fix GHS error
Task-number: QTQAINFRA-4601
Pick-to: 6.2
Change-Id: Ica32904ef6e76bc9f9f972f8c6bf02822980f888
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-29 21:01:42 +03: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
Heikki Halmet
8fac7c92c9 Provisioning: Change locale and language settings
Let's script this so we can be sure which language settings are in use

Pick-to: 6.2
Pick-to: 5.15
Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-29 06:51:55 +00:00
Heikki Halmet
36a58374d6 Provisioning: Remove unused code from JDK installation script
Amends abd2e0b381

Pick-to: 6.2
Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-10-29 09:51:52 +03: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
Pasi Petäjäjärvi
fe0b819588 CI: Add QNX QEMU image build package
* Define env variables needed
* Add build files only to create qemu image

Task-number: QTBUG-87628
Pick-to: 6.2
Change-Id: I26fd10b3e7950c7226c3c66f0b385b1acf0ac118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-27 10:11:27 +03:00
Heikki Halmet
ce9ef40366 Replace MinGW 8.1 with MinGW 11.2.0 in CI
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW

Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-25 11:39:07 +03: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
Dominik Holland
308584fbfd Provisioning: Update Python packages to the latest version
Pick-to: 6.2
Change-Id: I31f3eb4f2d633015105b2915eb8e385c1c2aa6cf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-10-20 19:51:04 +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
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
3de398e6eb Provisioning: Upgrade Vulkand SDK to the latest version
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum

Task-number: QTQAINFRA-4532
Pick-to: 6.2
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-19 07:48:09 +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
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
eb63604bc9 Include VCToolsVersion and WindowsSDKVersion to versions.txt
Let's include these needed versions to versions.txt and set
Visual studio versions as a last items in the versions list.

Task-number: QTQAINFRA-4542
Change-Id: Ic4c4c9f092925b0e4dc05a1874fa2ee651b24b7d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-11 07:43:59 +03:00
Heikki Halmet
33734ad9c1 Add Windows 10 version 21H1 to CI
Packaging targets needs to be parallel
with older Windows 10 version until packaging
site is ready to start using new windows 10
version.

Inlcudes:
 * MSVC 2022 version 17.0.0 preview 3.1
 * MSVC 2019 version 16.11.2
 * MSVC 2019 build tools version 16.11.2
 * MSVC 2015 version 14.0.25431.01 Update 3

Failing targets marked as insignificant

Task-number: QTQAINFRA-4517
Change-Id: If841509923c2534a5bf626078b97f2d3f63a07b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-10-11 07:43:56 +03:00
Marianne Yrjänä
153c7680cd Update QNX toolchain
Pick-to: 6.2
Change-Id: I6edd66365d73996ca4d02ee82ab86e63bb190fa7
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-08 09:07:03 +03:00
Dan Ackers
96269c2d01 Rename new file for clarity
Pick-to: 6.2
Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-29 13:33:29 +03:00