Commit Graph

41 Commits

Author SHA1 Message Date
Elias Toivola
368369beb1 Windows-10_22h2-x86_64: Disable MS services that we do not use
qtci-windows-10_22H2-x86_64-51 was copied as -52

In this new tier-1 image, the following services were disabled:
  - backgroundDownload.exe (part of MSVC)
  - Microsoft Edge update/installer and Onedrive

Also missing certification GlobalSign Root CA - R3 was added.

Pick-to: 6.7 6.5 6.2
Task-number: QTQAINFRA-6207
Task-number: QTQAINFRA-6490
Task-number: QTQAINFRA-6473
Change-Id: Ifd51d25a6c8d43b008ca65af22ebbd592cf57b85
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d58045688b)
2024-08-20 10:06:27 +03:00
Alexey Edelev
319f1f7945 Remove -DFEATURE_native_grpc=OFF
The flag was removed from qtgrpc repo and has no effect now. Clean it
up from all platform configs.

Change-Id: I59e200c6bcd63e03cc7c7477d502e456af8c9b01
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b3fda4d0fe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-07-24 08:20:20 +00:00
Alexandru Croitor
3624ced5cf coin: Mark platforms that should verify the generated SBOM
Task-number: QTBUG-122899
Change-Id: Ia4854f3af188e971b555cc1bd7bd6463fbbf7273
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 562b56c8d7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-07-18 22:03:10 +02:00
Alexandru Croitor
a066902627 coin: Mark platforms that should generate an SBOM
Task-number: QTBUG-122899
Change-Id: I3722c048ec4be894a09d3b023d6af95d4dfedc6f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3017e86d54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-07-18 22:03:08 +02:00
Tero Heikkinen
b6829751d2 Fix OpenSUSE 15.5 with new re-created Tier1 image
Task-number: QTQAINFRA-6065
Pick-to: 6.7 6.6 6.5
Change-Id: I24530bcca2a8f8e50686703d8cd8519c27195de2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
2024-01-19 10:02:09 +02:00
Elias Toivola
0b70b8f3c4 Update MinGW to v13.1.0 (x86_64)
Task-number: QTQAINFRA-5045
Change-Id: Id63e375faf2ed984c461ff4eab6271187672c3ea
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-12-11 13:14:06 +02:00
Jani Heikkinen
e05c8b8313 Move wasm multithread build from intel mac to openSuse
The same wasm binary is used in every hosts so it doesn't matter in which
host the build is done. That's why move the build from intel mac to linux
to save limited intel mac resources

Change-Id: I13212fc3950e90b6da4298a7cf8b67c7fa96cfb8
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-11-20 12:55:56 +00:00
Tero Heikkinen
0122ea6e0a Replace OpenSUSE leap 15.4 with OpenSUSE leap 15.5
OpenSUSE 15.5 will replace 15.4 in yaml configurations
at first and OpenSUSE 15.4 scripts are still kept for some time.

OpenSUSE 15.4 scripts will be removed later.

Task-number: QTQAINFRA-5666
Change-Id: Ic04dee5935b2d0ea9b99dd103f796d38ea90ba2d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-08-29 09:56:43 +03:00
Alexey Edelev
bde2b6e0eb Allow building ProtobufWellKnownTypes on WASM packaging platform
Specify QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR that points to the
host protobuf include directory, to grab the required .proto files.

Task-number: QTBUG-115582
Pick-to: 6.6
Change-Id: I3184439d92c8b79c9dc78a117584f7cf56b9eb97
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
2023-08-02 12:56:37 +02:00
Alexey Edelev
b028d7499f Disable native_grpc feature for "Packaging" platforms
Native gRPC channels rely on the reference gRPC implementation that
doesn't guarantee the ABI compatibility between different versions. We
shouldn't link libQt6GRPC to any 3rdparty libraries that are not
delivered as part of Qt when make packaging builds in CI.

Task-number: QTBUG-115055
Task-number: QTBUG-110107
Pick-to: 6.6 6.5
Change-Id: Ie099b0af833d87308179d3b4eecc47738078010c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-07-20 17:13:40 +00:00
Mikolaj Boc
d669e6faa2 Enable tests for webassembly-linux-thread-asyncify
This commit enables tests in CI for Wasm platform.

Fixes: QTBUG-109786
Change-Id: Ia44ab6ce3d5092fc90b07759d4d1a2c57edbf512
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
2023-07-03 09:12:40 +02:00
Heikki Halmet
6341108c6f Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Pick-to: 6.5 6.6
Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
2023-07-03 08:10:23 +02:00
Heikki Halmet
ac33d86e9a Add macOS 13 x86_64 to CI as build and test target
macOS 12 x86_64 will be replace with macOS 13. Tests will be still run
on macOS 12

Let's keep same Xcode version (14.2) than older macOS (12) has

Task-number: QTBUG-104210
Change-Id: If3e06834156196917001f83ca391a66a6c78e84a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-20 09:32:57 +00:00
Tor Arne Vestbø
8214de5e0e Remove conan profiles
The conan experiment has ended, and the files are only bitrotting
nowadays.

Pick-to: 6.5 6.6
Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-06-20 11:32:52 +02:00
Heikki Halmet
76a06d574c Update macOS Tier 1 images to use newer OS versions
macOS 11.7.5
macOS 12.6.4
macOS 13.3

Pick-to: 6.5 6.4 6.2 5.15
Change-Id: Ib3cb27fc8716baa52893a6c52fe3589f5e7daac1
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-04-13 05:08:20 +00:00
Heikki Halmet
92ae8eb4ca Add ID for all targets
All targets should have ID. This way it's easier to refer to needed
target

Pick-to: 6.4 6.5 6.3 6.2
Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-10 05:50:26 +00:00
David Skoland
d9fd5bfa01 Cleanup webassembly-linux-thread-asyncify config
Remove explicit references to sccache and use more basic
configure options.

Change-Id: If046b003fff1bd6c1bb7b120fba11ca067b0eb86
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-12-20 11:00:17 +01:00
Jani Heikkinen
27dd0c29fe Qt6: Build wasm target binaries only once
non-threaded Wasm build will be built only in windows.

threaded wasm build will be done in macOS.

thread-asyncify wasm build will be done in linux.

Change-Id: Ibea96aca1ec4ce15c632ba2f4223d898f6ebffaa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-11-24 09:14:04 +02:00
Alexey Edelev
ab0b005a57 Add the missing additional CMake host prefix to Android and WASM platforms
Add QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH for Android and WASM
platforms to allow CMake find the host qtprotobufgen. The prefix points
to a host Protobuf package which qtprotobufgen depends on.

Change-Id: I2250614dceafb4b93a8a13ddb549f4ecc459436b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 20:07:51 +01:00
Heikki Halmet
e9b3497c8e Add Windows 10 22H2 to CI
Pre-installed to tier 1:
          MSVC 2022 17.3.6 plus build tools
	  MSVC 2019 16.11.20 plus build tools
          MSVC 2015 update 3 14.0.25420.1

Task-number: QTQAINFRA-5262
Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-11-18 08:34:53 +00:00
Heikki Halmet
9c21dd75d2 Add openSUSE LEAP 15.4 (KDE) to CI
Graphichs Platform: X11 (System default) in image with suffix 50
Graphics Platform: Wayland (Plasma (Wayland) in image with suffix 51

Pick-to: 6.4 6.2 5.15
Task-number: QTQAINFRA-5049
Change-Id: If4b208bc12bd272c757aac61ffc9ef7a88df8f7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-11-04 15:31:36 +00:00
Morten Sørvig
f84d1d36a9 wasm: add multithreading configuration variants
Add FEATURE_thread=ON variant, with packaging enabled.

We now build the following configurations:

  "webassembly"                  (all desktop hosts)
  "webassembly-thread"           (all desktop hosts)
  "webassembly-thread-asyncify"  (linux, for auto tests)

Change-Id: Iac212b350ed4a5551c00df4ac1cd579a1ccd05f2
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-11-03 15:26:49 +01:00
Morten Sørvig
ed0e882396 Make sure all wasm configurations have an Id
The format is "webassembly-host-config".

Change-Id: Ibb360d8ea41cb50f7a1c6411432ac9df0200398a
Reviewed-by: David Skoland <david.skoland@qt.io>
2022-11-03 15:26:43 +01:00
Jani Heikkinen
a4db1a62b8 Qt6: Build wasm target binaries only once
Wasm will be built only in linux and those same binaries will be used also
in macOS and Windows.

Change-Id: If94098df624ab718491b9407c456d75ce7c7b117
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-01 05:18:44 +00:00
Johanna Äijälä
3e380e35b0 Update macOS11 (105) and macOS12 (105) templates
Use templates which have Accessibility enabled for
Squish.

Task-number: QTQAINFRA-3559
Pick-to: 6.4
Change-Id: I9538ea48791ea81738a41b1e101552cfc3bd454b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2022-09-29 10:04:19 +03:00
Alexey Edelev
c0ecadc049 Use macOS version from the packaging rules to build Qt
Use macOS 12 as the building platform for Qt. macOS 10.14 will be
deprecated as the building platform in Qt 6.5.

Pick-to: 6.4 6.3 6.2
Change-Id: I14d850a489efced84aa1e7e294d2ae75f5efa3de
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-08-05 09:49:39 +00:00
Alexandru Croitor
615091a6a8 coin: Use configure for WASM configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.

Pick-to: 6.2 6.3 6.4
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I534b630946f1fd9f79e8466886ea727697cabbc4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-06-08 23:28:02 +02:00
Morten Johan Sørvig
b9a7cd83ee wasm: add thread-asyncify build variant
Add thread-asyncify build variant for the linux host. This configuration
will be used for running auto-tests, and may also be packaged for
distribution in the installer at a future point in time.

The config options are:
 thread:   -DFEATURE_thread=ON
 asyncify: -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"

Task-number: QTQAINFRA-4876
Change-Id: Id3ab3134ddd1cb47cf0ae9ac4cd3db239cdde01f
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-05-04 17:06:40 +00:00
Toni Saario
28920cb7b4 Update conan profiles
Split the end user profile variants in two, e.g.:

linux-x86_64-gcc

->

  linux-x86_64-gcc  # 1
  baseprofiles/linux-x86_64-gcc  # 2

1) This is still the end user variant but this includes the
   counterpart from 3rdparty subfolder

2) This contains those settings and options that are needed
   for 3rd party depedencies like icu

Task-number: QTBUG-99213
Pick-to: 6.2 6.3
Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-02-28 07:43:41 +00:00
Heikki Halmet
ac2bdfb93a Remove old Windows 10 targets
Windows 10 21H2 is now significant for all targets

Pick-to: 6.3
Task-number: QTQAINFRA-4539
Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2022-02-04 08:17:33 +02:00
Heikki Halmet
0e641142c1 Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing

Pick-to: 6.3
Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-02-04 08:17:15 +02:00
Heikki Halmet
4eaaaa7c7c Replace Windows 10 21H1 with Windows 10 21H2 in CI
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25420.1 Update 3
Visual Studio 2019 + build tools version 16.11.7
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4651
Pick-to: 6.2
Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055
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
Tor Arne Vestbø
3c38cc22ce coin: Don't set CMAKE_C/CXX_COMPILER_LAUNCHER for sccache explicitly
The coin 'Sccache' feature will take care of it.

Pick-to: 6.2
Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-09 12:25:21 +01: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
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
Alexandru Croitor
551c838bad wasm: Don't include debug info in Qt for WebAssembly packages
This substantially decreases the package sizes. It's also what we
currently do for Qt 5.15.x WebAssembly builds.

See also f44dfe9c34 which did not enable
debug information for iOS builds because there's no implementation for
separating the debug info from static libraries yes.

Pick-to: 6.2 6.2.0
Task-number: QTBUG-96793
Change-Id: I743946c9e1367e88c7dd6dafec57648d9dbf2e9c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-09-24 15:19:07 +02: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
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
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
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