From 570f6b20e690a9af21880044f2ae0729f6bee592 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 6 Sep 2023 09:10:35 +0200
Subject: [PATCH] Use stable release for dev builds on JDK 20 and earlier.

See #36
---
 src/main.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 09e2407..7775671 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import * as c from './constants'
 import * as core from '@actions/core'
 import * as graalvm from './graalvm'
-import {gte as semverGte, valid as semverValid} from 'semver'
+import * as semver from 'semver'
 import {isFeatureAvailable as isCacheAvailable} from '@actions/cache'
 import {join} from 'path'
 import {restore} from './features/cache'
@@ -80,7 +80,7 @@ async function run(): Promise<void> {
         case c.VERSION_LATEST:
           if (
             javaVersion.startsWith('17') ||
-            (semverValid(javaVersion) && semverGte(javaVersion, '20'))
+            (semver.valid(javaVersion) && semver.gte(javaVersion, '20.0.0'))
           ) {
             core.info(
               `This build is using the new Oracle GraalVM. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
@@ -99,7 +99,18 @@ async function run(): Promise<void> {
               'Downloading GraalVM EE dev builds is not supported'
             )
           }
-          graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          const coercedJavaVersion = semver.coerce(javaVersion)
+          if (
+            coercedJavaVersion !== null &&
+            !semver.gte(coercedJavaVersion, '21.0.0')
+          ) {
+            core.warning(
+              `GraalVM dev builds are only available for JDK 21. This build is now using a stable release of GraalVM for JDK ${javaVersion}.`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
+          } else {
+            graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          }
           break
         default:
           if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {