From 26b7eb27f8128340955a76bf7630cbe2bcdff939 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Jul 2026 04:27:13 +0200 Subject: [PATCH] [3.14] gh-152785: Upgrade Java from 17 to 21 in GHA Android (GH-152783) Upgrade Java from 17 to 21 in GHA Android, and document the Java version requirement. (cherry picked from commit 0a13efc3fb0bf0896612ed20decce3ce4eb5e05b) Co-authored-by: Victor Stinner --- .github/workflows/build.yml | 2 +- Android/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f4845e6d68c7c..da19df666eb9b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -378,7 +378,7 @@ jobs: with: persist-credentials: false - name: Build and test - run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android + run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android build-ios: name: iOS diff --git a/Android/README.md b/Android/README.md index 0004f26e72b21c..0474bdf1a79147 100644 --- a/Android/README.md +++ b/Android/README.md @@ -31,7 +31,8 @@ any packages it needs. The script also requires the following commands to be on the `PATH`: * `curl` -* `java` (or set the `JAVA_HOME` environment variable) +* `java` (or set the `JAVA_HOME` environment variable). + Java versions 17 and 21 are supported. ## Building