From e8de9eb5ca729e019f912f2c4efb53fdb7e156e7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 3 Jul 2026 04:27:13 +0200 Subject: [PATCH] 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 +- Platforms/Android/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89be2d9c8ed84de..362db498eb6c2c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -401,7 +401,7 @@ jobs: with: persist-credentials: false - name: Build and test - run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android + run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android build-ios: name: iOS diff --git a/Platforms/Android/README.md b/Platforms/Android/README.md index d6f95c365c63a0b..54b7f1c46a59db0 100644 --- a/Platforms/Android/README.md +++ b/Platforms/Android/README.md @@ -30,7 +30,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