From b6df3384ba8a188787a7a361e91e90523e28c3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 7 Nov 2024 10:54:22 +0100 Subject: [PATCH] CI: Android build fix attempt --- .github/workflows/android_builds.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 353f8595ef33..d69bfa72098b 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -23,17 +23,19 @@ jobs: sudo apt-get update - name: Set up Java 8 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 8 + run: + # Not using actions/setup-java as it doesn't seem to work well with the Android NDK stuff. + # The version already present in Ubuntu should be fine. + sudo apt-get install openjdk-11-jdk + sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - name: Setup Android SDK and NDK uses: android-actions/setup-android@v3 with: - # Using an old version to be compatible with Java 11. + # Using an old version to be compatible with older Java. cmdline-tools-version: 8512546 - packages: tools platform-tools ndk;${{env.ANDROID_NDK_VERSION}} + # https://github.com/godotengine/build-containers/blob/3.2/Dockerfile.android + packages: build-tools;28.0.3 platforms;android-28 cmake;3.10.2.4988404 ndk;${{env.ANDROID_NDK_VERSION}} # Use python 3.x release (works cross platform) - name: Set up Python 3.x