From 742a3e4fbf5b34e3cd2f9f945b3bcba882b3c199 Mon Sep 17 00:00:00 2001 From: Knut Hjorth Date: Wed, 15 Mar 2023 12:32:39 +0100 Subject: [PATCH] Github actions: Remove android-33-ext5 from build image Github workflow image ubuntu-20.04 version 20230313.1 have added Android SDK Platform android-33-ext5. Something, possible the gradle version bundled with qt does not parse this correctly, and sets androidCompileSdkVersion in android-build/gradle.properties to "ext5" instead of expected "33". This commit is a quick fix to the problem, so the build will revert to android-33 which was used before 20230109.1. This fix was previously added for android-33-ext4 in image 20230109.1 in commit 6f636e7891fb9e204e4c6983eb2724e4d39c4aff. --- .github/workflows/android_release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml index 532fb4c..454839b 100644 --- a/.github/workflows/android_release.yml +++ b/.github/workflows/android_release.yml @@ -63,8 +63,10 @@ jobs: ndk-version: r21e add-to-path: false - - name: Remove Android SDK android-33-ext4 - run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext4" + - name: Remove Android SDK android-33-ext + run: | + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext5" + ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-33-ext4" - name: Install ccache run: sudo apt-get install ccache