Skip to content

Commit

Permalink
move to oracle-actions/setup-java
Browse files Browse the repository at this point in the history
  • Loading branch information
jpe42 committed Aug 17, 2024
1 parent 54ed59e commit be124b2
Showing 1 changed file with 13 additions and 15 deletions.
28 changes: 13 additions & 15 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,27 @@ jobs:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v3

- uses: actions/setup-java@v4
- uses: oracle-actions/setup-java@v1
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
with:
distribution: ${{ vars.JAVA_VENDOR }}
java-version: ${{ vars.GRADLE_JAVA_VERSION }}
java-package: jre
cache: 'gradle'
website: jdk.java.net
release: ${{ vars.GRADLE_JAVA_VERSION }}

- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
- run: |
printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
java --version
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
- uses: actions/setup-java@v4
- uses: oracle-actions/setup-java@v1
with:
distribution: ${{ vars.JAVA_VENDOR }}
java-version: ${{ vars.JAVA_VERSION }}
check-latest: true
website: jdk.java.net
release: ${{ vars.JAVA_VERSION }}

- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}

- run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties

- run: java --version

- name: Gradle Check
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon
run: |
printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
java --version
./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon

0 comments on commit be124b2

Please sign in to comment.