Android: Android OS 13 API 33 to CI as maximum version

Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.

Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Rami Potinkara
2023-05-09 22:18:42 +03:00
parent 401785e168
commit b9af6ca0a2
44 changed files with 54 additions and 126 deletions

View File

@@ -9,8 +9,8 @@ Configurations:
Target compiler: 'Clang'
Platform dependency: [
'rhel-8.4',
'android-x86-on-linux',
'android-x86_64-on-linux'
'android-6-x86-on-linux',
'android-13-x86_64-on-linux'
]
Features: [
'Sccache',
@@ -20,7 +20,7 @@ Configurations:
]
Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-x86_64-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
]