Use -version on JDK 8. Fixes #86

graalvm · Feb 23, 2024 · 3c67090 · 3c67090
1 parent e878075
commit 3c67090
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -102,8 +102,12 @@ jobs:
             java-version: '17'
             components: 'native-image'
             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'
-            java-version: '11' # for JDK11 notification
+            java-version: '11' # for JDK 11 notification
             components: 'native-image'
             os: macos-11
           - version: '22.3.1'
@@ -132,8 +136,8 @@ jobs:
             [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
           fi
           echo "JAVA_HOME: $JAVA_HOME"
-          java --version
-          java --version | grep "GraalVM" || exit 34
+          java -version
+          java -version | grep "GraalVM" || exit 34
           native-image --version
           if [[ "${{ matrix.java-version }}" != "dev" ]]; then
             gu list
@@ -143,7 +147,7 @@ jobs:
         run: |
           echo "GRAALVM_HOME: $env:GRAALVM_HOME"
           echo "JAVA_HOME: $env:JAVA_HOME"
-          java --version
+          java -version
           native-image --version
           gu.cmd remove native-image
         if: runner.os == 'Windows'

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