Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support running on ARM64 machines #73

Merged
merged 3 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/manual-uri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
options:
- 'ubuntu-latest'
- 'macos-latest'
- 'macos-14'
- 'windows-latest'
uri:
description: 'URI of JDK archive file to download'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-website-release-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fail-fast: false
max-parallel: 3
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-latest, macos-14, windows-latest ]
runs-on: ${{ matrix.os }}
steps:
- name: 'Check out repository'
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ This project uses tags and branches for [release management](https://docs.github


## [Unreleased]
_nothing noteworthy, yet_
### Fixed
- Support running on ARM64 machines [#63](https://github.com/oracle-actions/setup-java/issues/63)

## [1.3.3] - 2024-01-29
### Changed
Expand Down
4 changes: 4 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ runs:
shell: bash
run: |
JAVA=$JAVA_HOME_17_X64/bin/java
if [ ! -d "$JAVA_HOME_17_X64" ]; then
JAVA=$JAVA_HOME_17_arm64/bin/java
fi
$JAVA --version
DOWNLOAD=$GITHUB_ACTION_PATH/src/Download.java
if [ ! -z "${{ inputs.uri }}" ]; then
$JAVA \
Expand Down