Skip to content

Commit 3c91b59

Browse files
committed
8325444: GHA: JDK-8325194 causes a regression
Reviewed-by: gdams, shade, ihse
1 parent e8ceb71 commit 3c91b59

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.github/actions/get-jtreg/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,14 @@ runs:
5656

5757
- name: 'Build JTReg'
5858
run: |
59+
# If runner architecture is x64 set JAVA_HOME_17_X64 otherwise set to JAVA_HOME_17_arm64
60+
if [[ '${{ runner.arch }}' == 'X64' ]]; then
61+
JDK="$JAVA_HOME_17_X64"
62+
else
63+
JDK="$JAVA_HOME_17_arm64"
64+
fi
5965
# Build JTReg and move files to the proper locations
60-
bash make/build.sh --jdk "$(realpath bootjdk/jdk)"
66+
bash make/build.sh --jdk "$JDK"
6167
mkdir ../installed
6268
mv build/images/jtreg/* ../installed
6369
working-directory: jtreg/src

0 commit comments

Comments
 (0)