https://github.com/python/cpython/commit/25be001baa84e46b05bb3cc82206cbc32a86733e
commit: 25be001baa84e46b05bb3cc82206cbc32a86733e
branch: 3.14
author: Russell Keith-Magee <[email protected]>
committer: vstinner <[email protected]>
date: 2026-07-03T13:10:25+02:00
summary:

[3.14] gh-152785: Upgrade Java from 17 to 21 in GHA Android (GH-152783) 
(#152921)

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 <[email protected]>

files:
M .github/workflows/build.yml
M Android/README.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f4845e6d68c7cb..da19df666eb9b9b 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 0004f26e72b21c4..0474bdf1a79147c 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

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]

Reply via email to