Skip to content

Commit 25be001

Browse files
[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 0a13efc) Co-authored-by: Victor Stinner <vstinner@python.org>
1 parent 7d5970b commit 25be001

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
@@ -378,7 +378,7 @@ jobs:
378378
with:
379379
persist-credentials: false
380380
- name: Build and test
381-
run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
381+
run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
382382

383383
build-ios:
384384
name: iOS

Android/README.md

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

3333
* `curl`
34-
* `java` (or set the `JAVA_HOME` environment variable)
34+
* `java` (or set the `JAVA_HOME` environment variable).
35+
Java versions 17 and 21 are supported.
3536

3637

3738
## Building

0 commit comments

Comments
 (0)