Skip to content

Commit c09f078

Browse files
[3.15] gh-152785: Upgrade Java from 17 to 21 in GHA Android (GH-152783) (#152920)
Upgrade Java from 17 to 21 in GHA Android, and document the Java version requirement. (cherry picked from commit 0a13efc) Co-authored-by: Victor Stinner <vstinner@python.org>
1 parent 984ebbf commit c09f078

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ jobs:
401401
with:
402402
persist-credentials: false
403403
- name: Build and test
404-
run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
404+
run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
405405

406406
build-ios:
407407
name: iOS

Platforms/Android/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ any packages it needs.
3030
The script also requires the following commands to be on the `PATH`:
3131

3232
* `curl`
33-
* `java` (or set the `JAVA_HOME` environment variable)
33+
* `java` (or set the `JAVA_HOME` environment variable).
34+
Java versions 17 and 21 are supported.
3435

3536
## Building
3637

0 commit comments

Comments
 (0)