Commit Graph

4385 Commits

Author SHA1 Message Date
Liang Qi
51bc500098 CI: remove InsignificantTests flag for openSUSE build
Change-Id: Icea91c6ff4ff85451df08e74a937cbfb9eb1c0cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-12-10 21:03:38 +01:00
Qt Submodule Update Bot
cf8c35e562 Update submodules on 'dev' in qt/qt5
Change-Id: I19d52821fa51bb24e3b8fc35c1d9a0742ae3636b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 20:53:55 +02:00
Qt Submodule Update Bot
5f6935b88c Update submodules on 'dev' in qt/qt5
Change-Id: Iff16f6fe08c31f0ea4aeeca64df07b5080953ea3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 15:58:15 +02:00
Alexandru Croitor
b619ed1ba6 CMake: Remove CI qmake configs for Qt 6.1
Qt 6.0 is now built with CMake successfully in the CI and we have
most of the coverage we had with qmake CI configurations. Apart
from platforms and modules we deemed not part of 6.0 release.

We didn't have enough time to disable qmake configurations for
6.0.0, but we should be able do it now for 6.1.

We can also consider removing qmake configurations for 6.0.x
sometime later.

Remove all CI configurations that use qmake to build Qt.

Keep the default.yaml license check UseLegacyInstructions
configuration, because license checking hasn't been ported to use new
Coin instructions.

One consequence of this is that developers that are working on
platforms and modules not yet ported to CMake (like WebAssembly or
qtwebengine), will no longer have coverage in CI until they are ported
to CMake.

If there are repo owners that wish to retain CI coverage for building
their repo with qmake (until a CMake port is done), they can do so by
creating a product_dependencies.yaml file in the root of their repo
and specifying an older qt5.git sha1 (so before this change is merged)
which still contains qmake CI configurations.

Task-number: QTBUG-88741
Task-number: QTBUG-86053
Change-Id: I985cf0597d6d3e1717fdff8b654397a5f9236a6e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-12-10 14:19:03 +01:00
Qt Submodule Update Bot
84257dc4b9 Update submodules on 'dev' in qt/qt5
Change-Id: Idecb4c2602c368692227dea6030b48a5bb2a453a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 07:28:28 +02:00
Qt Submodule Update Bot
2479d6c2da Update submodules on 'dev' in qt/qt5
Change-Id: Icfaa989a2d590b29aa42863686b6b25a063ee0d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 00:56:27 +02:00
Qt Submodule Update Bot
0592ccadc2 Update submodules on 'dev' in qt/qt5
Change-Id: I3ee6dfcb6f57765a300ced02bda3f03786bf79cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 19:30:29 +02:00
Qt Submodule Update Bot
5efeea3b47 Update submodules on 'dev' in qt/qt5
Change-Id: I8fc605f65ec891f41de10ea83de29c06d85392b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 08:08:15 +02:00
Qt Submodule Update Bot
88c9dee48c Update submodules on 'dev' in qt/qt5
Change-Id: Ieb1d647a6c147eb682902be4f991c23f5cb0b8c5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 01:51:12 +02:00
Qt Submodule Update Bot
6202850d62 Update submodules on 'dev' in qt/qt5
Change-Id: I6d941f53a6816ee15032a725efdba107db05a819
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 19:15:45 +02:00
Qt Submodule Update Bot
2bfbdc419b Update submodules on 'dev' in qt/qt5
Change-Id: I9b833f3460153aa5e3445ccb466e0b2bf45e2040
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 13:39:17 +02:00
Tony Sarajärvi
1015211da7 Disable LSO regardless of network interface name
Pick-to: 6.0
Pick-to: 5.15
Change-Id: Ie439e11d9de6f71f4562b014b80a32fbf7660883
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-08 07:44:40 +02:00
Qt Submodule Update Bot
6b80f49efe Update submodules on 'dev' in qt/qt5
Change-Id: I3bb6c0167460d39410d99fa26014b400949ba51e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 06:35:35 +02:00
Alexandru Croitor
aa79f38529 CMake: Try to build qmake examples on more configs
Add qmake example builds to
- macOS Desktop non-framework builds
- qemu

Task-number: QTBUG-85986
Change-Id: Icfcf9883fa5ac33906a358c9347a1776eaac7696
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-07 18:20:29 +01:00
Heikki Halmet
bb4606c5c8 Change network adapter name for Windows 10 x86
Different Windows versions seems to use different name
for network adapter. Let's move this from common scripts
folder to Windows 10 platform folder

Pick-to: 6.0
Change-Id: I6a4a15ead41aef2e79b1b7782f1c5ffa6e46cae1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-07 12:16:14 +02:00
Qt Submodule Update Bot
93f7472fac Update submodules on 'dev' in qt/qt5
Change-Id: I4d5bc4501ac21e53aee305ced81a3f208d016e8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-07 11:06:28 +02:00
Qt Submodule Update Bot
4a0fe8680e Update submodules on 'dev' in qt/qt5
Change-Id: I04b4fc171ad24ba36dd9f2bdcd72e5a959b9d653
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-07 05:12:09 +02:00
Qt Submodule Update Bot
aff94d55ff Update submodules on 'dev' in qt/qt5
Change-Id: I475765758db11bad98ba2670829bfa5a0f6ba031
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-05 13:12:50 +02:00
Liang Qi
d3fc95535c CI: remove InsignificantTests flag for win10 msvc2019 developer build
Task-number: QTQAINFRA-3949
Change-Id: I3e39a082fe5d2a22f7e263185b5032fd4f0928e5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-12-04 19:12:34 +01:00
Kai Koehne
478c779baf Mark 'CMake Topological Sort' attribution as tools related
The code is only used for building Qt, and not shipped by customers.

Pick-to: 6.0
Change-Id: I0e255fe674b1703160608ab6b208918ea511baa4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-04 11:25:00 +00:00
Heikki Halmet
420d7f809c Update Windows 10 x86_64 version to 20H2
Windows 10 Enterprise 20H2, OS build 19042.508
Additional SW:
MSVC 2019 version 16.8.1
MSVC 2019 Build Tools version 16.8.1
MSVC 2015 14.0.25420.1
Virtio driver
Virtio Balloon driver
NetKVM driver
Vioserial driver
Guest-agent qemu-ga-x86_64

Pick-to: 6.0
Task-number: QTQAINFRA-3961
Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-04 12:17:14 +02:00
Qt Submodule Update Bot
68a07c69f1 Update submodules on 'dev' in qt/qt5
Change-Id: I80c49877609ef86b750c076598b34ba694c8b23c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-04 08:35:03 +02:00
Qt Submodule Update Bot
1232340ad7 Update submodules on 'dev' in qt/qt5
Change-Id: I149513a984d205ee85aa79941ba37eef0da95b33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-04 04:11:46 +02:00
Qt Submodule Update Bot
e252349c44 Update submodules on 'dev' in qt/qt5
Change-Id: Ifa0b282f397e7073695394c5b97e7b0e44b6f76c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 23:30:21 +02:00
Qt Submodule Update Bot
abec558476 Update submodules on 'dev' in qt/qt5
Change-Id: Ib72d869dd2fb127f8ab36079231e9b64a43bfaf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 14:56:36 +02:00
Alexandru Croitor
45ce639a62 CMake: Add headersclean feature to the packaging configs
Task-number: QTBUG-86053
Task-number: QTBUG-82615
Pick-to: 6.0
Change-Id: I89ed5b80b1c6fb793cfec5921b489cbd7693db20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-12-03 11:06:41 +01:00
Heikki Halmet
cdea442a3a Provisioning: Install Azure tool
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:49 +02:00
Heikki Halmet
8846d0d52d Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:48 +02:00
Qt Submodule Update Bot
94715a71ef Update submodules on 'dev' in qt/qt5
Change-Id: Ia566b4fc0f62cc3e025f372cde0cf211bda84c38
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 07:05:26 +02:00
Qt Submodule Update Bot
c416896e62 Update submodules on 'dev' in qt/qt5
Change-Id: I50ef73c1ecabf32117318b5c36b10177200c12f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 01:49:45 +02:00
Volker Hilsheimer
6e619b06d7 Checkout as detached if checking out branch fails
Having several toplevel worktrees for the same branch is problematic, but
but we do want to be able to have one toplevel worktree synchronized to
e.g. one submodule's dev and another with all submodules at the respective
dev heads.

So fall back to detached checkout if regular checkout fails, and generate
a warning.

Change-Id: I13981ab931cbbd8b56187979708bfe63f7373718
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:19 +01:00
Volker Hilsheimer
5bbec95c48 Add worktrees as detached
Since we later check the worktree out to the revision specified
in the dependency file, add it as detached to avoid conflicts
with already existing worktrees for the default branch.

As a drive-bye, fix a typo in a comment.

Pick-to: 6.0
Change-Id: I81c30c1fa3cfc9831fe7884a103746b43478dd8e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:16 +01:00
Volker Hilsheimer
21fea13125 Initialize missing submodules if a supermodule is present
When fetching dependencies, the submodule directory might not exist
or might be empty. If so, try to initialize the submodule before trying
to add the worktree.

Pick-to: 6.0
Change-Id: Ie4d6ec483ac9ea3f9207d5ab4cea34d6e0fb2921
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:13 +01:00
Qt Submodule Update Bot
2218bf230b Update submodules on 'dev' in qt/qt5
Change-Id: I5ddff3a16be5862f7385a06c32b4b376a0512f99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 23:32:51 +02:00
Volker Hilsheimer
b6dfb5e295 Support absorbed and unabsorbed submodules
Modern git usage for submodules is that the git object storage is absorbed
into the supermodule (see git submodule absorbgitdirs).

Handle both cases when trying to locate the gitdir for the target module.

Pick-to: 6.0
Change-Id: Icddbae3a4d9a8823551106f089dbbff2c935ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-01 20:11:39 +01:00
Qt Submodule Update Bot
a60501e35b Update submodules on 'dev' in qt/qt5
Change-Id: I26693607c5ef084536c35192fbd729236ae85cb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 16:37:14 +02:00
Alexandru Croitor
b8ae74d78a Mark Android test config as InsignificantTests
The qtbase Android test job often times hangs, causing other
integrations to fail. Until the issue is fixed, mark the config as
InsignificantTests.

Pick-to: 6.0
Change-Id: I4921d5a830bf49cb144a6e93bd4e3a6ee34f216f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-01 12:48:50 +01:00
Joerg Bornemann
0167a01022 CMake: Adapt to new QT_BUILD_TESTS variable
Change-Id: Ib35e164a8628ffc7d1429ba4756a27d4b98977e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 87269f4353)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-01 07:33:41 +00:00
Qt Submodule Update Bot
315ad7e5b6 Update submodules on 'dev' in qt/qt5
Change-Id: Iad7ee2d960e7104e213130bd5ac317b94f0b0573
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 09:33:39 +02:00
Simo Fält
f7659f5c7b Add platform configs for Pyside-setup
While default.txt contains configs with UseLegacyInstructions it can't
be used by pyside-setup, while it falls back to COIN's legacy
module class.

Change-Id: I5d2856344b817f6085ba66643f47803ccee29b06
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 32d8d76755)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-30 20:33:56 +00:00
Ville-Pekka Karhu
cb1df1dd5e Provisioning: Repo-clones taken into use in openSUSE 15.2
Task-number: QTQAINFRA-3894
Change-Id: Ie14ec072f41ae1c5ee185e2f73cb8fc5c86307f4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-30 09:44:49 +02:00
Toni Saario
395fe976be Add upload for the documentation artifact
The upload for the documentation was missing.

Change-Id: I9f1df81ecee3bbf6dd1128d24ae4fd2717bb3dcb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0848b04307)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-27 11:29:12 +00:00
Tony Sarajärvi
e472db17f3 Replace openSUSE 15.1 with openSUSE 15.2
Task-number: QTQAINFRA-4035
Change-Id: I11746ab2d6447dd5d33846bff68f6983670adbbe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-26 10:02:04 +00:00
Ville-Pekka Karhu
ace087df68 Provisioning: Move Centos 8 EPEL repos
Change-Id: I73ec04443a6edca2bf2add60b8df021ba1e8d4aa
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-25 10:14:14 +02:00
Assam Boudjelthia
9b5c3f0a6d Android: update build tools and SDK level to 29 in CI
Pick-to: 5.15 6.0
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-11-24 13:23:31 +02:00
Ville-Pekka Karhu
64f21fd0cc Repo-clones taken into use in Centos 8
Task-number: QTQAINFRA-3896
Change-Id: Id559af7421d592d75c91fe57060f8787ec4fd742
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-24 11:52:35 +02:00
Tony Sarajärvi
2ea6fd2eb2 Adjust order of provisioning scripts to solve a lock situation
01-enable-modules.sh was run before packagekit was disabled
causing lock situations where packagekit is still holding on to
System Management.

Task-number: QTQAINFRA-3959
Change-Id: Id9995bbe140055af323093b58225d85b2e116bab
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-24 07:52:10 +00:00
Simo Fält
1468849b30 Add CI config to run Android x86 test in emulator
Task-number: QTQAINFRA-3867
Pick-to: 6.0
Change-Id: Icabb8e5cd880087abcf1d2c68ac126a4d8bf8687
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-11-23 16:30:42 +00:00
Heikki Halmet
4a37ec2dd5 Provisioning: Use Remove function when removing items in Windows
Sometimes items are locked by some windows process so that they can't be
removed. This will fail provisioning instantly.

Let's give the removing process more time by retrying if it will fail
on first attempt

Change-Id: Ic5c16c0d920ed0625d0c6830323d0bc6ba2cd608
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 10:35:55 +02:00
Heikki Halmet
ed8cddd726 Provisioning: Install python-xml for RTA tests
RTA tests requires python 2 xml modules, e.g. xml.etree.ElementTree

Task-number: QTQAINFRA-3990
Change-Id: I9db41280a73ae97b0698198afea5fc5d48dec563
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 10:35:51 +02:00