diff options
| author | Elias Toivola <elias.toivola@qt.io> | 2023-10-04 12:55:05 +0300 |
|---|---|---|
| committer | Elias Toivola <elias.toivola@qt.io> | 2023-10-22 18:27:31 +0300 |
| commit | ab4ba58eeb52d600bdd2a68e4864d69516b1628d (patch) | |
| tree | a163eb19575c9f2540f51f33d086b8d076aafc1d /coin/platform_configs | |
| parent | 491fb5492eb19158c8dcaf6c8f58e0affa8aee92 (diff) | |
Remove Android 13 from CI, set Android 14 as max version
Task-number: QTQAINFRA-5770
Change-Id: I29347255f9e606b9aa32fe000325cf57d4eb1b30
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android.yaml | 18 | ||||
| -rw-r--r-- | coin/platform_configs/linux_android_tests_multi_abi.yaml | 4 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-android-automotive.yaml | 2 |
3 files changed, 4 insertions, 20 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 6a1ffb51..609b6061 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -48,7 +48,7 @@ Configurations: 'ANDROID_EMULATOR=emulator_x86_api_23' ] - - Id: 'android-13-x86_64-on-linux' + Id: 'android-14-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -57,22 +57,6 @@ Configurations: Platform dependency: 'rhel-8.8' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_64_api_33' - ] -- - Id: 'android-14-RHEL-8.8-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] - Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 285ada96..9a68ea6f 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -10,7 +10,7 @@ Configurations: Platform dependency: [ 'rhel-8.8', 'android-6-x86-on-linux', - 'android-13-x86_64-on-linux' + 'android-14-x86_64-on-linux' ] Features: [ 'Sccache', @@ -22,7 +22,7 @@ Configurations: Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', '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', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_23' ] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 03997b2c..ff599631 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -13,7 +13,7 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-6-x86-on-linux', - 'android-13-x86_64-on-linux' + 'android-14-x86_64-on-linux' ] ] Configurations: |