Commit Graph

3357 Commits

Author SHA1 Message Date
Simo Fält
6a0591da9a Merge remote-tracking branch 'origin/ifw-5.12.10' into ifw-5.12.11
Task-number: QTIFW-2130
Change-Id: I3c045c06262547fc226e563c0e861d9aa855de18
2021-10-05 14:01:39 +03:00
Heikki Halmet
0253936025 Provisioning: Add needed packages for supporting libarchive
This is required by IFW

Task-number: QTIFW-2310
Change-Id: Iade1ff6339bfe43f3f35486377f6c77ae593cec3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-08 08:37:04 +03:00
Dimitrios Apostolou
f7f32fa293 08-pythondev build should not execute external script
The important bits of the script were copied and modified.

NOTE that we no longer build openssl from source, the distro (SLES15) provides
a version that works well.

Task-number: QTQAINFRA-3528
Change-Id: Iad63d75055a7efc3e104789e4a515b8511cf0880
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit db23c64876)
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-08 08:37:03 +03:00
Toni Saario
5ba9b7c979 Disable D3D12 on Windows IFW
Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-06-17 06:24:03 +00:00
Simo Fält
55a2b79e22 Disable not needed platform configs from ifw specific branch
While the branch is installer-framework specific, there is no need to
re-verify such platform configurations which are not used by
installer-framework.

Change-Id: If7023b98e83167260e8d4a06a9575e3aaa75fe4c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:33 +03:00
Simo Fält
52bd6da041 Hide LLVM_INSTALL_DIR from qdoc in Windows
Currently provisioned libclang is not working with static runtime build
in Windows. To allow integration to pass, we need to skip building of
qdoc by hiding required libs from it.

Change-Id: I2b2bbc20d1bb016552ed1b3d4e70dc9c0544fcce
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:30 +03:00
Simo Fält
3fd82a915c Add static-runtime configure argument
Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-06-03 09:25:27 +03:00
Simo Fält
00527b1fb4 Remove Conan provisioning script
It is breaking currently and it doesn't provide anything which IFW
would need.

Change-Id: Id2187fa98fb024921edeac9533396dd6caa27d37
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:25 +03:00
Simo Fält
66ed11f58b Install static version of OpenSSL to Windows
Building Qt with static runtime requires static libs of
OpenSSL.

Change-Id: Ifba2e88fefed341cafd804f29fe8dde7001eafa7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:22 +03:00
Simo Fält
9574f6ae66 Provisioning: Install prebuilt qdoc
Change-Id: I7991388b027bb8550618f5a2c78902dc98550c12
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-03 09:25:20 +03:00
Qt Submodule Update Bot
fce0a78067 Update submodules on '5.12.11' in qt/qt5
Change-Id: I42b89cc2f962a40b464121c3041afa36f0034e83
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.11
2021-05-19 11:36:16 +00:00
Qt Submodule Update Bot
5573e41155 Update submodules on '5.12.11' in qt/qt5
Change-Id: I1072d36bfde240a52b7eab59ca2b1615f49f037b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-11 04:42:43 +00:00
Jani Heikkinen
f9ae718fbc Adjust submodule branches 2021-05-07 11:35:56 +03:00
Qt Submodule Update Bot
415931b469 Update submodules on '5.12' in qt/qt5
Change-Id: I4be547ac24cc09ec5029400a58232a62d496921d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-07 01:30:46 +00:00
Qt Submodule Update Bot
23b62295a5 Update submodules on '5.12' in qt/qt5
Change-Id: Ie9653d2922043e9faf853125d0a777c9984a2617
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-05 01:30:57 +00:00
Heikki Halmet
0607b95757 Provisioning: Activate SLES and enable modules
Pick-to: 5.12.7
Pick-to: 5.12.10
Task-number: QTQAINFRA-4437
Change-Id: Icfe15e028634eeef85671b2becefe98123f567f8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-03 08:19:57 +03:00
Liang Qi
77c6124574 provisioning: update python to 3.7 on macos
Task-number: QTQAINFRA-3271
Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ecf2f4f38c)
2021-04-29 07:06:03 +03:00
Heikki Halmet
81f028ea89 Provisioning: Upgrade python 3.6 version to 3.6.2 in Windows
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Pick-to: 5.12.10
Pick-to: 5.15
Task-number: QTQAINFRA-4433
Change-Id: Ifa9d45b4a3e06f4455221bb76087b600c1f1e06a
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-29 07:06:01 +03:00
Qt Submodule Update Bot
24828e019f Update submodules on '5.12' in qt/qt5
Change-Id: Ib9d0bd7cb2be268eca50ac7ddd7da304f505ff0d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-21 01:30:53 +00:00
Qt Submodule Update Bot
e2c965d63c Update submodules on '5.12' in qt/qt5
Change-Id: Iefbb31ab68ce709e0f1bdb35f3be0c0c8cacf06b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-17 01:30:44 +00:00
Qt Submodule Update Bot
7b27e4df65 Update submodules on '5.12' in qt/qt5
Change-Id: Ie02d878df4db33863a31aa5cff1051514cb5ee92
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-16 11:41:46 +00:00
Qt Submodule Update Bot
586623a7bd Update submodules on '5.12' in qt/qt5
Change-Id: Ia615c5a1a209da34d72d27be4ec410c5af94eb13
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-14 01:31:03 +00:00
Heikki Halmet
dc0ba63a36 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 26c97222c1)
2021-04-12 07:21:41 +03:00
Qt Submodule Update Bot
e613cf3f20 Update submodules on '5.12' in qt/qt5
Change-Id: Iff793d3ce57838ee19c427bbc9f7fec42ab2b94c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-10 01:30:44 +00:00
Qt Submodule Update Bot
b5d8877609 Update submodules on '5.12' in qt/qt5
Change-Id: I7be3b5cc62ae72ac72593a6446f3e4a84b40f184
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-07 01:31:08 +00:00
Qt Submodule Update Bot
0f66ed1f6e Update submodules on '5.12' in qt/qt5
Change-Id: Ic4d273c4a8c6a8649525eba2d721ab620a85ff22
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-02 01:30:47 +00:00
Heikki Halmet
ba149a162b Provisioning: Reset Time Zone for macOS 10.13
Setting Time Zone for macOS 10.13 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-30 11:29:50 +03:00
Qt Submodule Update Bot
e2f83926b1 Update submodules on '5.12' in qt/qt5
Change-Id: I80f5bd53611e1c3524b7632624473ee8dbdf1f55
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-26 01:30:44 +00:00
Qt Submodule Update Bot
ceb7c71d46 Update submodules on '5.12' in qt/qt5
Change-Id: I61e242b349dd307b5ad7f963545c0a9ef1f372da
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-25 01:30:45 +00:00
Qt Submodule Update Bot
f25db1ef51 Update submodules on '5.12' in qt/qt5
Change-Id: Ied5a5459e01f2f8f5f62040f733b17c4074292b8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-23 01:31:05 +00:00
Qt Submodule Update Bot
ab41ea785b Update submodules on '5.12' in qt/qt5
Change-Id: I8412750f59b7d49e95b773d5d41c941c6c723bdf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-17 01:32:12 +00:00
Qt Submodule Update Bot
24ebf2f933 Update submodules on '5.12' in qt/qt5
Change-Id: I70aae73b3f43ede6c7a7b7a8146dcd990367bb8e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-15 01:30:45 +00:00
Qt Submodule Update Bot
628b13fbcb Update submodules on '5.12' in qt/qt5
Change-Id: I57729ce620493708e432c72d1d6bd7ca77eb2e83
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-14 01:30:47 +00:00
Qt Submodule Update Bot
470ddd250e Update submodules on '5.12' in qt/qt5
Change-Id: Ifbe9efda7fa535e948f7fc55a24c5b3485e80a79
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-10 01:30:43 +00:00
Qt Submodule Update Bot
5d057f12da Update submodules on '5.12' in qt/qt5
Change-Id: I3fb0a3bdb9591cb6e21aefa8c013fc08f497aa7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-07 01:30:52 +00:00
Qt Submodule Update Bot
2ba9a54fcd Update submodules on '5.12' in qt/qt5
Change-Id: Ib49481c475d4a7c3b933d9ddced48768bec3c34a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-04 01:30:55 +00:00
Katja Marttila
e206ed1b37 IFW Coin: Build only release builds
Without the '-release' option IFW tools are built as debug. In
Windows it means unnecessary large installers and dependencies to msvc
debug libraries.

Change-Id: I3197216c91e82934ea11bdc3d635ce61516bc64e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 8da20a0a1b)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:04:29 +02:00
Simo Fält
5770eaaa52 Fix tqtc-installer-framework platform configs
Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 53680499c8)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:03:55 +02:00
Simo Fält
12b090a24c Fix installer configure args to create only release executables
Fixes: QTIFW-1999
Change-Id: I0efe695e8bdab9bc23e8122deb6b4e7f8aafa7bd
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 2d76b3d64d)
2021-03-03 09:03:51 +02:00
Iikka Eklund
351e5f2f5f Add platform config for tqtc-installer-framework
This is similar to installer-framework.yaml with added configurations
for QtInstaller specific builds.

This enables two sets of builds from the same branch of
tqtc-installer-framework.

First set is for plain tqtc-installer-framework builds
i.e. the commercial deliverable.

The "QtInstaller" set is for the consumption of Qt Installer
creation.

Task-number: QTIFW-1027
Change-Id: Ifff750eef2631ce4e16edb32a7f7df593c698944
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 307038829f)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2021-03-03 09:03:48 +02:00
Iikka Eklund
bc3e3ad85f Enable tests for installer-framework
Remove DisableTests feature from build configurations.

Task-number: QTIFW-1638
Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 5f1199953f)
2021-03-03 09:03:45 +02:00
Qt Submodule Update Bot
e85a598cb8 Update submodules on '5.12' in qt/qt5
Change-Id: I7b0f096e00a8861b8d9c516d04ea776cfb179b6a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-03-02 01:30:47 +00:00
Qt Submodule Update Bot
e0b77db165 Update submodules on '5.12' in qt/qt5
Change-Id: I4fd3b112181a5ab5909edb4be07d63348a40489f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-02-26 01:30:46 +00:00
Heikki Halmet
7e2fd354b0 Provisioning: Install Azure tool
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 883b9a4192)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:11:02 +00:00
Heikki Halmet
b9bb764e8d Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5888d1c9ba)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:58 +00:00
Heikki Halmet
8c83faf39e Provisioning: Remove brew cask list query
brew cask list --versions don't work anymore with macOS 10.13:
Calling brew cask list is disabled!

Change-Id: I44d64bea36577212d0d8ff1fbd4f40111b8cadee
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit e3c294489f)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:53 +00:00
Heikki Halmet
a3c179f754 Provisioning: Install p7zip using --build-from-source parameter
brew install p7zip isn't working anymore with macOS 10.13 and 10.12.
Let's use --build-from-source parameter with brew installation

Task-number: QTQAINFRA-4128
Change-Id: Ib1a2db1cd3176955cca450e5ebe0d0fc1bee3aa4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c470301c34)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:49 +00:00
Heikki Halmet
e41c48ebf8 Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
(cherry picked from commit 08a384605a)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:44 +00:00
Heikki Halmet
2baf83b180 Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature

Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d238c03742)
(cherry picked from commit 105f54c090)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:40 +00:00
Heikki Halmet
9c71fcd258 Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6d20944daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b66e4773c8)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-12 17:10:34 +00:00