From c305c2e5804343a27f808ea4e931df196ca57e7e Mon Sep 17 00:00:00 2001 From: zyphlar Date: Sun, 11 Jan 2026 21:41:35 -0800 Subject: [PATCH] [ci] Set Java 21 as default for Android builds Signed-off-by: zyphlar --- .forgejo/workflows/android-check.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index eefad21bf..1512eb857 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -41,6 +41,8 @@ jobs: container: image: codeberg.org/comaps/docker-android-sdk:latest options: --user root + env: + JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64 steps: - name: Install build dependencies shell: bash @@ -51,6 +53,7 @@ jobs: python3-pip \ openjdk-21-jdk pip install "protobuf<3.21" --break-system-packages + update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java - name: Install Android SDK components shell: bash @@ -78,6 +81,8 @@ jobs: container: image: codeberg.org/comaps/docker-android-sdk:latest options: --user root + env: + JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64 strategy: fail-fast: false matrix: @@ -113,8 +118,10 @@ jobs: python3-pip \ zlib1g-dev \ git \ - ccache + ccache \ + openjdk-21-jdk pip install "protobuf<3.21" --break-system-packages + update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java - name: Install Android SDK components shell: bash