From fb596da6aa727d75a839229e539fe5fa2caeb875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 26 Jan 2026 10:32:15 +0200 Subject: [PATCH] CI: Enable arm64 configs for qtbridge-java Change-Id: Ibafc5105ab8a1494b2bb9f705b56e8f3d74a7e30 Reviewed-by: Toni Saario --- coin/platform_configs/qtbridge-java.yaml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/qtbridge-java.yaml b/coin/platform_configs/qtbridge-java.yaml index 31751b75..4a26ed95 100644 --- a/coin/platform_configs/qtbridge-java.yaml +++ b/coin/platform_configs/qtbridge-java.yaml @@ -4,7 +4,7 @@ Include: [ "macos-quick-bridges", "linux-quick-bridges", "windows-quick-bridges" - ] + ] ] Configurations: @@ -15,6 +15,12 @@ Configurations: Platform dependency: 'windows-quick-bridges' Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava'] +- + Id: 'windows-on-arm-quick-bridges-java' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava'] + - Id: 'linux-quick-bridges-java' Template: 'qtci-linux-Ubuntu-24.04-x86_64-54' @@ -23,9 +29,16 @@ Configurations: Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava'] - - Id: 'macos-quick-bridges-java' + Id: 'linux-on-arm-quick-bridges-java' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-52' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava'] + +- + Id: 'macos-quick-bridges-universal-java' Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' - Platform dependency: 'macos-quick-bridges' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava'] - + Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava'] + Environment variables: [ + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', + ]