From 8dd4f51a5ea8ebf82fdb520e3d668c6718ebf4de Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 20 Sep 2023 12:59:33 +0200
Subject: [PATCH] Fix gu integration for GraalVM for JDK 21.

Fixes #62.
---
 dist/cleanup/index.js | Bin 2884245 -> 2884903 bytes
 dist/main/index.js    | Bin 2932306 -> 2933066 bytes
 src/gu.ts             |   5 +++--
 src/main.ts           |   5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 2bed22492706a1e92e6ea93a78aea757437681e1..c6200c01fcdb3224b7b0dde3f62a4bbf8284d9e9 100644
GIT binary patch
delta 837
zcmZWmO-~b16io+;wt%+Ex1blSw9}S?3%?Qzp;E=9uqY)le0FGG+ktk5%uJEkG_be^
z!vYhDc^VU9WWkmgli8TKai=E6m5CcS{tFl0nTnC{CMR#^zH`o-bMN!VhmM2oL&qjM
zP{2B@M<+JmDLjoXbYmknVKbh=v*<xDp2PFlg00ww?bv~x*o7Cc8+-5~UU~;JuBM2g
z$)$iOif#bzeJ!+_h6}zn@E;y<@o#U0ey(}oqX%eZ*-|+l@EdY5%lKyxbnp=`B)k7R
z%19bBz;g75L6elcx#NZ3n;V0JFd?mjF69^$nUXgOkW)2~V5v-IAZM9k$T^v55l9sn
zl!*J6R+5#n4%Z=5kTfY{Fip3VZZb58s25btV7dWobReq=Je0}$$aW|~PbfBh-<24P
zxHGDv8~pBVLFC)d;DeLui81rqF7!A#?1I>B7Zwxo$$P2sFm+>M^ufO`emD%B{O1-l
z@|*S0%iq3$Pv)(t@ZI68`L>J*s~h$!{rw7?qNGWdXX_A!z?xJnGZCW0P$63@c%a6d
zHPjWRgsr^upyurU*s3I3ElL?yqPFOwtpc!J$j;u$$6676wI~~bw69`06_jc)Ek>4A
zSve{x)yh!VSD_24)wDI@lPaYeIw`t(OjIQy4YsT)wcGjATvsc9@)G)>7Q`NG^my`G
zZ1epqs1q9I=CUEb$b&IqhY#&TGhf<+c3+yx!C7hG(dfX;z`U=Lh^JEV<k;xc_~i6N
zES|LD@UA;TjDI1G`D+iB>)R;o30^3@wXhF_UP2$?GQmf<Lg**>2?2sg2$~D~p&N^T
E089oJbN~PV

delta 379
zcmZ49wSjSJ>juV#7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB827Qq&w7U33=
z7SR^57V#E|7ReT=7U>q57TFfL7Wpj-QJmWoITc>9P4^K{_%uCMP$8O`OF?0J!4f8`
z?IJ=7dm5%UPFC2zJ#vZyC+qZvU?yqC+UXlx6(pt~n5po6`ph&b?rHNBl%{`(V+xq=
z6b~eR+cNnu0ZnkXWAd7AkiZl;y*Yu&G$c7cued~^I590%!B(LxF{d;YXpMq`UU5NA
zW{HM+OiZzsx~5)Mer6t+Q*EGQSgWpyu0|VKjrw+{c?!%-tkDL#ma)@47AS0$0h*Jd
z6`iPC<)|B_8w+IsrFCPq)VC`vRM^GBuMScUlm;r&jn!6f|FBd6h!ufY35b<}SOthx
XfmjWQLGl_vtO>+g+dnMTHjf7Y?UaKw

diff --git a/dist/main/index.js b/dist/main/index.js
index 96d2a92960744dbebacd44e6e3c0b6ccc47d34c3..0697f8f9c3b8c1971be3afc2574f268fef800245 100644
GIT binary patch
delta 966
zcmZWmOHUI~7)=LSDGzCpw>&<u44t;LMZ{o~R|Ulch!#i;FFTZ5I#8x$Iz?jBK+H`r
zEHIJ84`V`%ELlj<WI|%13s<NKVP)b%H~tC3!aGwj67J;W&V2WrbLV{D(ea+?;PG42
z3N=xVX3=bFrWSgR=1?omrFk@;7SQvwklLu77SRi|n3m8|T1Lxh1+AnPX%(%eHMI5}
zj9T-(sv^xh1wqIKK>I7ML{qJBXu<C`u;S5cjz`4?pKQR^G?_}yI2%<dHcjx04a%|8
z4#BGbj>4isRL~t8J)ns4jJ9rv<CSHf4+g{~NQe;vF(S{XQHaD95Me6G%s`qZvMNO+
zqIh9AN?@LG|I+3qIhlZ~5RQt97*>gr(3QE&P-VnKG_I&5p~50Nkm52tl$iC2t>4QY
zcVOg>wZF%k8;;8f6>r_(1YCOtAIz-Y-=no|K(!fR1B5E0@SwkU@b++@hjnA1`~JT#
z-0gr0{J9Ew*p>}-xVH(PwQKF%H<LNzTinSlEE})v@8`%6OBy6IWC_~AxhTexM1b}V
zNHJSIxHH2XQ{!_)_UL&hARaOLW2k~;Atr{&JZnorFjN4B3$rtJ=A$ofVj(7}&X6Oe
zJ4NNRD<pVl<C1(*lG7=_$B|+eq|+gN#Aj7<+I?2kd`gsNLN?f>B4=*Lr;*AMeDVV7
zArr(HZ2Rftnb_L<mypF-#>c1KjRLv?+&cQVp#Z10pv)0sW!IS4^r*XOv}wYT>hB#M
z?hW>I5A_X>3<P?EdK|30$p!E$(`di8U^csyg+0S_hgK)IfuW9}p5YRMLz~=gD3Wl0
z$Kt{twR|D&-{YNFc)6h&5Au1J1_gX13wJ*@oI~2ew_$~gFTzb5e-{s1_!29~$yf|{
z9x(q3FKDfHUarA~u^fZlg}%kQ9Nh8o&vo{74E;7`>%=;3$<Ld!u<K2kW%a0qXJ}+_
QG6)PV2Df(9;#pby11Ri4F8}}l

delta 565
zcmZXPO-~b16o%88wzNfPX;Bam57oKT>2#W+5tRfLHWI@EgE5gZmWfQw5NsQ!cA+7u
zdJKduh7&df6ImPl$Rx(7Tf6ipxH7C77P`=dM`7W|;<>pu?{nUh+j#iW_vyzAUmblY
zp^SbEU=Uj{gkg+eD;~l&Y{w|Zumj_mz)n1jN3aXK@hJ9SFZSUv?8oD;U^?tsVb~4Q
zL=5)G?0~!+0ien=Y1r$G!`nJNScCW8jVBNeP<=}3^)1oPW9X(28}N-biao9Cn~<dD
zO=*(G3VeJYktQT=xO_pnLb+M#Dm|K&&Rn}yF1b~3t)dMhP_q{9+PnrJ>sA(=YD%4%
zanq`noi973-;evb%;1u${p;v|I;uCe39=N(=Zy0vjc>v0KJJ-I=Pl#js4;Dr2N#YF
zGp%~?6yErw>MxyRmJCx@mz&$b3@}ON1as1BZYyzzhNA+h@L9=t@1mk8uT75nNpqBT
z3auzf+Wn%mQDj9KIGf64z_stx?8U-hmcQoAX{mXuW?i=zU8h{qKnVEDxm~r{@V+Jl
z_R~dOgy`cbv99fR>^J;Za1in+Pwt!+37IPSPz&h^agMfDgE6}Fyeqie7!r)iq!^7!
MGrHFp%G6hX0>?(bzyJUM

diff --git a/src/gu.ts b/src/gu.ts
index 0d9dac8..166d425 100644
--- a/src/gu.ts
+++ b/src/gu.ts
@@ -1,9 +1,9 @@
 import * as c from './constants'
 import * as core from '@actions/core'
+import * as semver from 'semver'
 import {GRAALVM_PLATFORM} from './constants'
 import {exec} from './utils'
 import {join} from 'path'
-import {gte as semverGte, valid as semverValid} from 'semver'
 
 const BASE_FLAGS = ['--non-interactive', 'install', '--no-progress']
 const COMPONENT_TO_POST_INSTALL_HOOK = new Map<string, Map<string, string>>([
@@ -34,10 +34,11 @@ export async function setUpGUComponents(
   if (components.length == 0) {
     return // nothing to do
   }
+  const coercedJavaVersion = semver.coerce(javaVersion)
   if (
     graalVMVersion === c.VERSION_DEV ||
     javaVersion === c.VERSION_DEV ||
-    (semverValid(javaVersion) && semverGte(javaVersion, '21.0.0'))
+    (coercedJavaVersion != null && semver.gte(coercedJavaVersion, '21.0.0'))
   ) {
     if (components.length == 1 && components[0] === 'native-image') {
       core.warning(
diff --git a/src/main.ts b/src/main.ts
index 4f6c107..f6cd7b5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -83,11 +83,13 @@ async function run(): Promise<void> {
           throw new Error(`Unsupported distribution: ${distribution}`)
       }
     } else {
+      const coercedJavaVersion = semver.coerce(javaVersion)
       switch (graalVMVersion) {
         case c.VERSION_LATEST:
           if (
             javaVersion.startsWith('17') ||
-            (semver.valid(javaVersion) && semver.gte(javaVersion, '20.0.0'))
+            (coercedJavaVersion !== null &&
+              semver.gte(coercedJavaVersion, '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).`
@@ -106,7 +108,6 @@ async function run(): Promise<void> {
               'Downloading GraalVM EE dev builds is not supported'
             )
           }
-          const coercedJavaVersion = semver.coerce(javaVersion)
           if (
             coercedJavaVersion !== null &&
             !semver.gte(coercedJavaVersion, '21.0.0')