lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-26 06:37:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: move platform dependency from RHEL 8 to RHEL 9

Browse Source 
Pick-to: 6.10 6.8 6.5
Task-number: QTQAINFRA-7498
Change-Id: I48a72860fe9d06cde1f014298e68fa28caff730d
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
This commit is contained in:
Elias Toivola
2025-10-21 10:41:00 +03:00
parent e2450da3f6
commit 4dcaf6ec01
12 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/platform_configs/linux_android_tests_multi_abi.yaml
View File

@@ -2,13 +2,13 @@ Version: 2
Configurations:
-
Id: 'android-9-multi-abi'
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: [
'rhel-8.10',
'rhel-9.4',
'android-9-x86-on-linux',
'android-15-x86_64-on-linux'
]
@@ -20,7 +20,7 @@ Configurations:
'InstallDepsPerPlatformSubdir'
]
Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.4',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',