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

Run action with Java 21 #77

Merged
merged 2 commits into from
Mar 21, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/jdk.java.net-uri-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: $JAVA_HOME_17_X64/bin/java --show-version src/ListOpenJavaDevelopmentKits.java ${{ github.event.inputs.name }}
- run: $JAVA_HOME_21_X64/bin/java --show-version src/ListOpenJavaDevelopmentKits.java ${{ github.event.inputs.name }}
2 changes: 1 addition & 1 deletion .github/workflows/jdk.java.net-uri-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- run: curl --output /dev/null --verbose --head --fail https://jdk.java.net
- uses: actions/checkout@v4
- run: $JAVA_HOME_17_X64/bin/java src/ListOpenJavaDevelopmentKits.java > jdk.java.net-uri.properties
- run: $JAVA_HOME_21_X64/bin/java src/ListOpenJavaDevelopmentKits.java > jdk.java.net-uri.properties
- run: |
git diff
git config user.name github_actions_dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: 'Compile and run test'
shell: bash
run: |
PATH=$JAVA_HOME_17_X64/bin:$PATH
PATH=$JAVA_HOME_21_X64/bin:$PATH
javac -d classes src/Download.java test/Test.java
java -cp classes Test
validate:
Expand All @@ -27,5 +27,5 @@ jobs:
- name: 'Run validation program'
shell: bash
run: |
PATH=$JAVA_HOME_17_X64/bin:$PATH
PATH=$JAVA_HOME_21_X64/bin:$PATH
java test/Validate.java
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ This project uses tags and branches for [release management](https://docs.github

## [Unreleased]
### Fixed
- Support running on ARM64 machines [#63](https://github.com/oracle-actions/setup-java/issues/63)
- Support running on ARM64 machines
### Changed
- Default value of `release` input to Java `22`
- Run action with pre-installed Java 21

## [1.3.3] - 2024-01-29
### Changed
Expand Down
6 changes: 3 additions & 3 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ runs:
id: download
shell: bash
run: |
JAVA=$JAVA_HOME_17_X64/bin/java
if [ ! -d "$JAVA_HOME_17_X64" ]; then
JAVA=$JAVA_HOME_17_arm64/bin/java
JAVA=$JAVA_HOME_21_X64/bin/java
if [ ! -d "$JAVA_HOME_21_X64" ]; then
JAVA=$JAVA_HOME_21_arm64/bin/java
fi
$JAVA --version
DOWNLOAD=$GITHUB_ACTION_PATH/src/Download.java
Expand Down