Skip to content

Commit 0d081a0

Browse files
committed
try to teach gradle about setup-java env variables
1 parent 7ab0f4e commit 0d081a0

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/actions/prepare_env/action.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ runs:
1717
# Gradle specifically looks for JDK_N environment variables to detect installed JDK versions,
1818
# so we need to ensure it can find it, so it picks up JDK_24 since we are using 21 for Gradle itself,
1919
# because it does not (yet) support JDK 24+. If it did, we wouldn't need multiple JDKs installed.
20-
if [[ -n "$JAVA_HOME_24_ARM64" ]]; then echo "JDK_24=${{ env.JAVA_HOME_24_ARM64 }}" >> "$GITHUB_ENV"; fi;
21-
if [[ -n "$JAVA_HOME_24_X64" ]]; then echo "JDK_24=${{ env.JAVA_HOME_24_X64 }}" >> "$GITHUB_ENV"; fi;
22-
if [[ -n "$JAVA_HOME_21_ARM64" ]]; then echo "JDK_21=${{ env.JAVA_HOME_21_ARM64 }}" >> "$GITHUB_ENV"; fi;
23-
if [[ -n "$JAVA_HOME_21_X64" ]]; then echo "JDK_21=${{ env.JAVA_HOME_21_X64 }}" >> "$GITHUB_ENV"; fi;
24-
echo $JDK_21;
25-
echo $JDK_24;
20+
if [[ -n "$JAVA_HOME_24_ARM64" ]]; then echo "JDK24=${{ env.JAVA_HOME_24_ARM64 }}" >> "$GITHUB_ENV"; fi;
21+
if [[ -n "$JAVA_HOME_24_X64" ]]; then echo "JDK24=${{ env.JAVA_HOME_24_X64 }}" >> "$GITHUB_ENV"; fi;
22+
if [[ -n "$JAVA_HOME_21_ARM64" ]]; then echo "JDK21=${{ env.JAVA_HOME_21_ARM64 }}" >> "$GITHUB_ENV"; fi;
23+
if [[ -n "$JAVA_HOME_21_X64" ]]; then echo "JDK21=${{ env.JAVA_HOME_21_X64 }}" >> "$GITHUB_ENV"; fi;
2624
shell: bash
2725
- name: Check Java environment
2826
run: |

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists
8+
org.gradle.java.installations.fromEnv=JAVA_HOME_24_ARM64,JAVA_HOME_24_X64,JAVA_HOME_21_ARM64,JAVA_HOME_24_X64

0 commit comments

Comments
 (0)