Commit Graph

578 Commits

Author SHA1 Message Date
Jani Heikkinen
74234e3fa4 Add '-DFEATURE_gds=OFF' as a non-qtbase configure argument for macOS packaging host
We need to disable GDS feature to solve OpenSSL library linking issue

Fixes: QTBUG-93759
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 2fd650b973)
2021-09-10 17:14:35 +03:00
Iikka Eklund
d68e108b94 Add Conan profiles
Create conan profile per packaging configuration. Profiles will
carry configuration information to the builds conan does.

Profiles allow users to replicate identical configurations
to the packaging configurations and reuse existing binaries.

Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-06 13:58:10 +03:00
Eike Ziller
1f3bdc686e COIN/Qt Creator: Only have one RHEL configuration
No need to have multiple RHEL configurations for Qt Creator.
Remove 8.2 since that will be removed for Qt as well.
Make the "Features" consistent.

Follow-up of cca8ac0023

Change-Id: Ie64578a22262c45b5ed9c2679b3072c958218bcf
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-08-30 11:09:03 +02:00
Alexandru Croitor
f0c7664195 Build minimal subset of tests in qtdeclarative desktop static builds
Pick-to: 6.2
Task-number: QTBUG-87580
Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-08-27 10:53:23 +02:00
Alexandru Croitor
4fea3be3af iOS: Build a subset of tests when targeting iOS
Currently will only build tests/auto/cmake projects in qtbase.
More work is needed for the other repos.

Pick-to: 6.2
Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-08-26 20:17:07 +02:00
Heikki Halmet
cca8ac0023 Remove Insignificant flags from Rhel 8.4 targets
Task-number: QTQAINFRA-4516
Change-Id: Ib508de80d6cb22c5d3a8a5faf2b9614355053827
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-23 12:13:03 +03:00
Tony Sarajärvi
426bab28a8 Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498
Change-Id: I248a0ea19a7e2af59350ba66b55983c20927fff3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-08-23 08:12:43 +03:00
Eike Ziller
bbd31689ec COIN: Re-add qtsdk.yaml
That is used by our Jenkins setup for packaging.
To keep things simple, just include the cmake_platforms and
Qt Creator's config.

Pick-to: 6.2
Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-08-19 11:56:03 +02:00
Topi Reinio
e8a86ab6c8 Provision qdoc and qtattributionsscanner
Provision documentation generators for Ubuntu 20.04, and add 'TestDocs'
feature to the configuration already used for generating documentation.

This is to allow building docs during the testing cycle to block
integrations that introduce new documentation warnings, without the
need to add a dependency to qttools.

Pick-to: 6.2
Fixes: QTBUG-83851
Change-Id: I74d7daeb7abb49403e97af41b0521f903607ce55
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-08-16 11:21:31 +02:00
Tony Sarajärvi
dcab4e83f3 Revert "Replace SLES 15 SP2 with SP3"
This reverts commit 5ecf01ade7.

Reason for revert: Wicked doesn't work well with our Windows 2012's DHCP

Change-Id: I062fbfb50a68af308db9cb810583ca85c2c3e627
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-16 07:18:13 +00:00
Heikki Halmet
9ff48e5585 Add Red Hat 8.4 to CI
Red Hat 8.4 will be added as parallel with Red Hat 8.3 until packaging
site gives green light to remove the older Red Hat version.
Also targets which are not tested during Qt5 integration will be set
as Insignificant until proven to work

Task-number: QTQAINFRA-4516
Change-Id: I3d9543da315b3d93ee8d9e37389acaf7212b00f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-13 09:03:39 +03:00
Mitch Curtis
9b3411da8d Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-12 17:44:44 +02:00
Alexandru Croitor
1256b4d504 Remove qtgraphicaleffects.yaml from platform_configs
Pick-to: 6.2
Task-number: QTBUG-95757
Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-08-12 15:43:31 +02:00
Tony Sarajärvi
5ecf01ade7 Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498
Change-Id: I3d4ab50d16d7279cac771ac3a911af53489e2e2d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-08-12 14:30:54 +03:00
Jani Suonpera
f573f15f03 Add platform configs for meta-qt5
Uses same configs as meta-boot2qt

Task-number: QTBUG-91354
Change-Id: I9ec77404e99404273e094308b9cef71ef73fb044
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-08-11 13:20:01 +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
Kimmo Ollila
16ab287262 Add Integrity target for other modules
QtQuick3D, QtRemoteObjects, also enable Harfbuzz and Assimp

Change-Id: I26e0f60afad40e66f858f99e8e7c852ac5fd9fbb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-29 08:19:41 +03:00
Kimmo Ollila
dd24bc25c9 Add Integrity target for other modules
QtDeclarative, QtImageFormats, QtShaderTools and QtQuickControls2

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-28 07:54:00 +03:00
Simo Fält
9385d5d687 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-28 07:53:26 +03:00
Kimmo Ollila
401ef8a8b3 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-27 09:50:52 +03:00
Simo Fält
b5c4effe7e Make Integrity platform config as a cross compile target
While there was no target os value, COIN thinks that it is a normal
desktop target. This causes the host and target artifacts being copied
to wrong location.

Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-22 10:26:16 +03:00
Ulf Hermann
fab470c190 Coin: Add tqtc-qmlcachegenplus configuration file
Pick-to: 6.2
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-14 10:51:52 +02:00
Alexandru Croitor
d7c2951de0 CMake: Update provisioned CMake to version 3.20.5
Pick-to: 6.2
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-07-09 16:58:13 +02:00
Assam Boudjelthia
f1fcb89f26 Remove qtandroidextras.yaml from platform_configs
Following qtandroidextras removal in the commit
912fdda4a4, coin's  platform
config yaml file has to be removed.

Pick-to: 6.2
Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2021-06-29 11:55:04 +03:00
Heikki Halmet
ebf78374a7 Remove Insignificant flag from Windows ARM target
Task-number: QTQAINFRA-4452
Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 0a5e63dce9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-28 09:21:05 +00:00
Jani Heikkinen
bae9580da1 Add missing wasm target build for windows and macOS hosts
Based on wasm maintainer these should work already

Pick-to: 6.2
Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-25 17:18:26 +10:00
Heikki Halmet
9a029a5872 Switch back to RedHat 8.2 for Android target
Timeout increased so this should be ok to move back to Redhat 8.2

Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e216d829ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-21 04:58:57 +00:00
Alexandru Croitor
52eebe8a89 WoA: Build both release and debug configs for Windows on ARM
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.

Pick-to: 6.2
Task-number: QTQAINFRA-4492
Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-06-16 15:00:29 +02:00
Robert Griebl
2b22f80725 Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-06-15 19:55:29 +02:00
Tor Arne Vestbø
27f62f7dd8 coin: Make macOS on ARM developer-build tests significant
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit b90fef29dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-15 05:56:39 +00:00
Simo Fält
9673311626 Add 'Packaging' feature for Mac TestOnly CI configs
This will allow exporting the testlogs for release.

Pick-to: 6.1
Pick-to: 6.2
Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-09 13:01:32 +00:00
Dominik Holland
30e02f32fb Add a platform config file for Qt DLT Logging
Change-Id: I6ad13ba724158719c463d1e64e9aa21e59cd89c9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
2021-06-07 22:47:24 +02:00
Dominik Holland
632997a94e Add a platform config file for Qt Interface Framework
Task-number: AUTOSUITE-1633
Change-Id: Ie960510ac3c7e53c6e1b8cdbac26a339b72d31d5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 22:47:19 +02:00
Tony Sarajärvi
d9be0951b4 Replace openSUSE 15.2 with 15.3
Task-number: QTQAINFRA-4477
Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 18:40:13 +03:00
Michal Klocek
b28866f7b1 Switch webview builds to cmake
Task-number: QTBUG-88620
Change-Id: I77bc7ad283d6b33590cc27e23dead7aac301fec9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-06-04 16:33:29 +02:00
Heikki Halmet
ba869e1975 Add Integrity target for QtBase including provisioning changes
At this point let's add only target for QtBase. Target for
QtDeclarative, QtQuick3d and QtQuickcontrols2 will be
added later when we have all required fixes.

Task-number: QTQAINFRA-3555
Task-number: QTQAINFRA-4285
Change-Id: I59ef76079e98ba428cdb7abcb2560f434c37f517
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-04 11:25:05 +03:00
Heikki Halmet
c399c02fe7 Use CentOS 8.3 when running tests with Android emulator
Rhel 8.2 with Android emulator seems to be unstable

Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-02 07:20:58 +03:00
Eike Ziller
3b2dd1560c COIN: Remove unused parameters from qt-creator.yml
We are not using them for the Qt Creator build, since for us it makes
more sense to define these things in the Qt Creator branches. They
create additional noise (and confusion) in the COIN interface though, so
remove them.

Pick-to: 6.1
Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-05-28 10:27:32 +02:00
Heikki Halmet
b1a3ccb99c Remove InsignificantTests flag from Windows developer build
This patch only affects to dev branch.
Separate patch will handle 6.1 and 6.0 branches

Task-number: QTQAINFRA-4427
Change-Id: Ibaf6422061e9cd66a3458922fae7a4533f80c40f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-27 11:33:50 +03:00
Lars Knoll
dff3eab96c Add a platform config file for Qt Multimedia
Change-Id: I56460067682dd221756266513ec994ebb4794209
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-27 10:32:54 +02:00
Tor Arne Vestbø
565ca05254 coin: Make macOS ARM packaging config test significant for all modules
Change-Id: Icc30025a33de602e6677b47f131b0557a4d2eabd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-25 09:37:04 +02:00
Simo Fält
ce66a83485 Fix used Ubuntu version for Pyside6 license check
Pick-to: 6.1
Change-Id: I9f966089818559178d6e1e2c286da25bbd8219e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-05-24 10:21:29 +00:00
Michal Klocek
f0ec54c6fb Switch qtwebengine to cmake
Add defaults for now. Later this should get customized
to avoid unnecessary targets.

Task-number: QTBUG-91760
Change-Id: I72d3f11e117abeecf6c8c5fefac16fe951d3a9da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-22 14:36:00 +02:00
Alexandru Croitor
b2fc30956b wasm: Enable sccache for wasm configurations
Change-Id: I564348482511b472940d6c75623d90809a6693a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-05-19 19:14:18 +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
Tor Arne Vestbø
2cca3aa049 Add qt5 macOS ARM packaging insignificant tests
Change-Id: I62847257a0e8dcb3e48714cb1140a09bebcb53c2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 13:48:22 +02:00
Tor Arne Vestbø
16a03d48a6 coin: Make macOS on ARM packaging tests significant for a few modules
Not all modules pass yet, but we want to at least make the ones that
do blocking.

Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-18 12:37:32 +02:00
Allan Sandfeld Jensen
c4fb89196c Add qtwebchannel config
Change-Id: Ida06681db4cceac72c7cc5b8dcad34457399d756
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-18 10:27:00 +02:00
Jani Heikkinen
6056d3be5f Change 'Target arch' for macOS universal build
This build containing both x86_64 and arm64 architectures. The 'Target
arch' ends up in the binary package names and needs to be changed
because '+' is illegal character in Amazon S3 file names so replace the
'+' with '-' in the 'Target arch' section.

Fixes: QTBUG-93778
Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 05:06:47 +00:00
Heikki Halmet
ca1894acaa Remove CentOS 8.3 targets
Provisioning scripts will be removed later

Task-number: QTQAINFRA-4415
Change-Id: I71da9743066a81638518f44dc663324246a2ce8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-17 20:40:58 +03:00