Commit Graph

80 Commits

Author SHA1 Message Date
Eike Ziller
38fc03cc3b COIN: Do not specify full path to 7zip
It is in the PATH, and the full path makes
changing platforms/VMs harder (like updating to ARM Macs)

Change-Id: I3b4a3208aa066e8000321d6a548b9559c249dc5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-24 13:19:22 +00:00
Eike Ziller
64a9da8114 COIN: Switch sdktool to Qt 6
Change-Id: I638c0b385a27e1e5b036102330b8f5a80899343c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-24 12:03:43 +00:00
Eike Ziller
595c2051d2 COIN: Fix the branch used for tqtc-qtsdk
'master' was changed to 'production'

Change-Id: Iffbf6dad061e0a9a86d456410dcde55a9ff21fb9
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-24 10:39:09 +00:00
Cristian Adam
f7991a80f5 GitHub/Coin: Update LLVM/Clang to 18.1.7
Fixes: QTCREATORBUG-31045
Change-Id: Id70b3ac32a944c89763d095f5dcf6cd20849610d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-13 10:04:50 +00:00
Eike Ziller
62c555acd7 COIN/GitHub: Use Qt 6.7.1
Also update the PRECHECK to use Qt 6.7 provisioning, so we get a
job that tests the Qt Creator build with tests disabled too
(on Windows).

And remove the 32bit Windows sdktool+cdbextension+wininterrupt-only
build, which is no longer done for 14.0

Change-Id: I49e5348c83e4cdd22797df559c448f962e005f15
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-05-30 09:10:46 +00:00
Eike Ziller
928f6d6ac4 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	coin/instructions/build.yaml

Change-Id: Ie5530baed71a79d49cb107d3f82e4427475c6ff7
2024-05-27 10:13:23 +02:00
Eike Ziller
30d755ccb4 COIN: Respect the DisableTests feature setting
COIN already skips running tests with this feature, but
also build Qt Creator without test support.

Change-Id: I10e8323466a4baf4cac7128efbdbd54b16bb8e2c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-23 06:47:51 +00:00
Eike Ziller
3a1b18108d COIN: Respect the Sccache feature setting
If the platform configuration doesn't include Sccache in the features list,
we should not use sccache for building.

Change-Id: I3ab459165e77923f59f037f844bd72e89abfd42b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-05-23 06:45:55 +00:00
Cristian Adam
6f8621e967 GitHub/Coin: Update LLVM to version 18.1.5
Change-Id: Icf0359e934943508ecd4d96b02ab1ca22ae5a9af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-06 09:57:34 +00:00
Eike Ziller
58f6a3a459 COIN/GitHub: Use Qt 6.6.2
Change-Id: Ib9303ea53eb8b14851c670c144ed6a3261c2d6cb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-05 08:09:37 +00:00
Eike Ziller
bbf02473e0 COIN: Do not try to download qtquickcontrols2
It doesn't exist anymore

Change-Id: I0bb50e0fc247022b563c370cd36cf046191c9c7f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-12-20 11:48:01 +00:00
Eike Ziller
90e6fb54b6 COIN: Update to Qt 6.6 provisioning
That Qt version is used for building as well

Change-Id: Idae06324532b0dc2f453b802ca3d817fe3d41593
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-15 07:10:35 +00:00
Eike Ziller
176be6a563 COIN/GitHub: Switch to Qt 6.6.0
Which we use for the packages

Change-Id: I7fa6c001f356ca23409444567d94246731d0fffe
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-10-24 07:52:02 +00:00
Cristian Adam
c32022f085 GitHub/Coin: Update LLVM/Clang to 17.0.1
Change-Id: I0cc3e3640eb60cd991fba073f8d32d3de9b900fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-27 14:32:59 +00:00
Cristian Adam
263b1e70ef Clang/LLVM: Update to version 17.0.0-rc4
Change-Id: Ica6c5db764db8c3b8105c168f9001d7de3c6c5c1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-19 11:41:22 +00:00
Eike Ziller
ad16dba14c GitHub/COIN: Use Qt 6.5.2
Change-Id: Id2c7b7080ac2efb05e93d88804007fc3f61e1dc3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:20:57 +00:00
Eike Ziller
eb7c645ee8 COIN: Avoid usage of download/master.qt.io
It has issues with download speeds leading to timeouts

Change-Id: I1ab2eb4a2e1959c0147dd56411c28c4b4604eb51
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-14 11:35:45 +00:00
Eike Ziller
cedd37fc01 COIN: Use https
because http is now broken for master.qt.io.

Change-Id: I861e86e7a1f345a2810883b707d9392b101516d3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-07-04 06:05:40 +00:00
Eike Ziller
648cf50d85 Coin/GitHub: Switch to Qt 6.5.1 and LLVM 16.0.2
Change-Id: Ida29b97f937e374935e853eff62b30777a9142aa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-26 06:15:00 +00:00
Eike Ziller
8e8ebc8f88 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	coin/instructions/build.yaml

Change-Id: I697b0107e75c6259989247de2180437d7987ff37
2023-05-17 14:55:02 +02:00
Eike Ziller
c06d291b11 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I4264592dbf3a8bf105ad507cb4496777cd0e92b3
2023-05-12 14:42:24 +02:00
Patrik Teivonen
8cd00ad279 Coin: Switch to the new packaging tools scripts location
Script location is changed from qtsdk.git to tqtc-qtsdk.git.
Adjust the coin instructions to use the new location.
This change should be picked to all the branches in use.

Task-number: QTQAINFRA-5506
Change-Id: I78abb36781cfaaff72870c297ba152066ac5f385
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 12:41:49 +00:00
Eike Ziller
7724f8653f Merge remote-tracking branch 'origin/10.0'
Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
2023-05-05 10:39:47 +02:00
Eike Ziller
73d8b20d52 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: Ic82c30a479a7ce7eab31b3c18abb3c46a71711cd
2023-04-28 11:03:36 +02:00
Patrik Teivonen
9e54d37ef6 Coin: Add instructions to install pyenv for qtsdk.git
Make sure that the required Python version for qtsdk can be
installed in the future.

Change-Id: Ie69cf79a33e4e4529dd34de7729d3014f8631fe2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-28 08:48:05 +00:00
Eike Ziller
44aaad4c2f COIN/GitHub: Bump to Qt 6.5.0
Change-Id: I8c2122b7f35d049f0249631fc6e045b79dff9fbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-21 06:37:23 +00:00
Eike Ziller
c842b96f77 COIN/GitHub: Use Qt 6.4.3 and LLVM 16.0.0
Change-Id: I95ddc7a95b5761d29b111f3eff3fdfc014efaa51
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-04-13 09:37:49 +00:00
Cristian Adam
53397306b9 LLVM/Clang: Update to version 16.0.0-rc2
This was the newest release tag last week.

Change-Id: Idd272db9dc7ff797023fac72ea8a252729d979b3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-22 11:40:31 +00:00
Patrik Teivonen
1b6d434c9c Coin: Update instruction yamls to run qtsdk scripts in Pipenv
Install the Python module dependencies for qtsdk from Pipfile and run
the install_qt.py and bld_sdktool.py script inside the Pipenv virtual
environment.

Change-Id: Id84733b822964ed2099883de3708f9da2e2d1818
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-12 15:22:50 +00:00
Eike Ziller
adc874f690 COIN/GitHub: Use Qt 6.4.2
Change-Id: Ia66ce7e0a8ebf988c1af9888ddb7e9461f0cac05
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-06 08:28:17 +00:00
Cristian Adam
d852ec53a1 GitHub Actions / COIN: Update Qt to 6.4.0
Amends 169f2c4af6 due to the task
number QTBUG-108593.

Change-Id: Id3ab685632e32fad953d837d2f7ab357b034d739
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-28 13:53:25 +00:00
Cristian Adam
169f2c4af6 GitHub Actions / COIN: Update Qt to 6.4.1
Change-Id: Icf1600c761989914e5de5ed024d7f4c4f2f01e18
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-15 17:27:06 +00:00
Eike Ziller
35a37c3450 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: I6a5cd79d60195579538ed8684010d295b4eea047
2022-11-15 09:50:05 +01:00
Eike Ziller
facb2bdb4d COIN: Adapt to changes in install_qt.py
Change-Id: Ie6acef0baafc5950fd025cc0fe9c3da9bb82a8d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-11-15 08:42:52 +00:00
Eike Ziller
5e99a16e46 COIN: Build sdktool
Adds a step to build sdktool against Qt 5.15.2, which we require to succeed
for packages.

Change-Id: I251ea928372e5c607e24c7b2b7d1e3dd23f2d26d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:59:24 +00:00
Eike Ziller
5ae23f8c66 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
2022-09-13 11:15:16 +02:00
Eike Ziller
c9e0d08571 COIN/GitHub: Use Qt 6.3.2
Change-Id: If49d111eec5cd4b4a229c3f21ff282733dd3fbb2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 11:59:17 +00:00
Cristian Adam
91c88c7390 Clang: Update to LLVM/Clang 15.0.0
Change-Id: I31599c3f7e869be7553c21d889df8fa870b1b93f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-08 08:31:24 +00:00
Eike Ziller
3ec87e37ee Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
2022-07-20 12:03:40 +02:00
Eike Ziller
4c2306798d COIN: Include QtWebEngine in PRECHECK
Though we don't want to ship packages with it, it should still check
compilation.

Change-Id: I2ca018a564cf8164deb6d8ebc3e428c6969991cf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-07-15 11:06:50 +00:00
Eike Ziller
def3cb70ab COIN: Do not sign on Windows
We don't use this anywhere except when running tests in COIN,
so this is wasted time & resources.

Change-Id: Ied053e0ffcdf41b460cda6f093b7c85143e53d6f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-12 12:33:02 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Eike Ziller
aed367ceb6 COIN: Archive less data, instead provision before testing too
Larger archives seem to result in upload issues.

Change-Id: Id73bf203c609f07ad1174839e3ada0049416a66d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-12 11:08:45 +00:00
Eike Ziller
b338405477 Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 13:36:18 +00:00
Eike Ziller
d059a610b1 COIN: Arm auto tests
Some of our auto tests fail, so add an EXCLUDE_FROM_PRECHECK option for
add_qtc_test, which sets a corresponding label on the ctest, and exclude
these when running ctest on COIN.

Disable the Googletest based unittests for now, they are inconsistently
failing on CI, e.g. sometimes timing out after 60 seconds for tests that
usually take only a fraction of a second.

tst_perfdata from the perfparser submodule also fails. Temporarily
disable it explicitly, until the EXCLUDE_FROM_PRECHECK change can be
merged there.

Change-Id: I7e9d7aded75bbe8800f82f7aa125c181271a2a1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-05 10:13:18 +00:00
Eike Ziller
70fb66f9ee COIN: Add test instructions
For now just run them without failing the precheck on failing tests.
The test results are only visible in the precheck details
on testresults.qt.io

Remove the fixed timeout of 5 seconds, since this depends on the test
setup where the tests are run, and it is not possible to override a
fixed timeout with the --timeout option of ctest.

Change-Id: Ib5f12092b64d0cf87e1213b031e1990973e18669
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-29 12:05:06 +00:00
Eike Ziller
4c4f787e84 COIN: Fix installing Qt after script updates
'wget' is now imported by one of the python scripts

Change-Id: I8e4fe32f813550586d19ccb76a55ec7ed13441c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-22 09:47:05 +00:00
Eike Ziller
6767b9b737 COIN/GitHub: Use Qt 6.3.1
Change-Id: I2485ef1ec0414d503a907d69fcc277f80d569286
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-17 11:20:41 +00:00
Eike Ziller
64fc40c3a5 COIN: Use Qt 6.3.0
Which we also use for packages

Change-Id: I6c3a413149586e3aac47ab7ba5166fc51b2dadb8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-19 07:51:47 +00:00
Cristian Adam
e608243ee5 GitHub Actions / Coin: Update LLVM/Clang to 14.0.3
To be in sync with the official packaging.

Change-Id: I28712ad1e8234d4911b2afcce949e1e919bf8e92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-18 10:59:27 +00:00