graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2025-01-18 19:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use -version on JDK 8. Fixes #86

Browse Source
This commit is contained in:
Fabio Niephaus 2024-02-23 08:22:08 +01:00
parent e878075a91
commit 5393c3d809
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/test.yml vendored
View File

@ -102,8 +102,12 @@ jobs:
java-version: '17' java-version: '17'
components: 'native-image' components: 'native-image'
os: ubuntu-20.04 os: ubuntu-20.04
- version: '21.2.0'
java-version: '8' # for JDK 8 notification
components: 'native-image'
os: ubuntu-latest
- version: '22.3.1' - version: '22.3.1'
java-version: '11' # for JDK11 notification java-version: '11' # for JDK 11 notification
components: 'native-image' components: 'native-image'
os: macos-11 os: macos-11
- version: '22.3.1' - version: '22.3.1'
@ -132,8 +136,8 @@ jobs:
[[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23 [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
fi fi
echo "JAVA_HOME: $JAVA_HOME" echo "JAVA_HOME: $JAVA_HOME"
java --version java -version
java --version | grep "GraalVM" || exit 34 java -version 2>&1 | grep "GraalVM" || exit 34
native-image --version native-image --version
if [[ "${{ matrix.java-version }}" != "dev" ]]; then if [[ "${{ matrix.java-version }}" != "dev" ]]; then
gu list gu list
@ -143,7 +147,7 @@ jobs:
run: | run: |
echo "GRAALVM_HOME: $env:GRAALVM_HOME" echo "GRAALVM_HOME: $env:GRAALVM_HOME"
echo "JAVA_HOME: $env:JAVA_HOME" echo "JAVA_HOME: $env:JAVA_HOME"
java --version java -version
native-image --version native-image --version
gu.cmd remove native-image gu.cmd remove native-image
if: runner.os == 'Windows' if: runner.os == 'Windows'

2
dist/main/index.js generated vendored
View File

@ -94364,7 +94364,7 @@ function run() {
(0, reports_1.setUpNativeImageBuildReports)(isGraalVMforJDK17OrLater, graalVMVersion); (0, reports_1.setUpNativeImageBuildReports)(isGraalVMforJDK17OrLater, graalVMVersion);
core.startGroup(`Successfully set up '${(0, path_1.basename)(graalVMHome)}'`); core.startGroup(`Successfully set up '${(0, path_1.basename)(graalVMHome)}'`);
yield (0, exec_1.exec)((0, path_1.join)(graalVMHome, 'bin', `java${c.EXECUTABLE_SUFFIX}`), [ yield (0, exec_1.exec)((0, path_1.join)(graalVMHome, 'bin', `java${c.EXECUTABLE_SUFFIX}`), [
'--version' javaVersion.startsWith('8') ? '-version' : '--version'
]); ]);
core.endGroup(); core.endGroup();
} }

2
src/main.ts
View File

@ -155,7 +155,7 @@ async function run(): Promise<void> {
core.startGroup(`Successfully set up '${basename(graalVMHome)}'`) core.startGroup(`Successfully set up '${basename(graalVMHome)}'`)
await exec(join(graalVMHome, 'bin', `java${c.EXECUTABLE_SUFFIX}`), [ await exec(join(graalVMHome, 'bin', `java${c.EXECUTABLE_SUFFIX}`), [
'--version' javaVersion.startsWith('8') ? '-version' : '--version'
]) ])
core.endGroup() core.endGroup()
} catch (error) { } catch (error) {