From 809e0c5b2f341bfb3fcae80da631b095e29abff8 Mon Sep 17 00:00:00 2001
From: B67687 <111849193+B67687@users.noreply.github.com>
Date: Wed, 29 Apr 2026 17:20:31 +0800
Subject: [PATCH 1/4] graalvm: update to latest 25.0.2 and fix checkver

- Update version from 22.3.1 to 25.0.2
- Fix checkver regex from vm- to jdk- pattern
- Use extract_to + installer script for consistent extraction
- Update autoupdate to use jdk- URL pattern
---
 bucket/graalvm.json | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/bucket/graalvm.json b/bucket/graalvm.json
index fd492935c18..6fe0b3baa8e 100644
--- a/bucket/graalvm.json
+++ b/bucket/graalvm.json
@@ -1,23 +1,28 @@
 {
     "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
-    "version": "22.3.1",
+    "version": "25.0.2",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-windows-amd64-22.3.1.zip",
-    "hash": "f7250a997f0c251a78a447d38e9bd791ba2e35240d70338694cc6b9003a1ff4b",
-    "extract_dir": "graalvm-ce-java19-22.3.1",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_windows-x64_bin.zip",
+    "hash": "72edc27ce2dd3c156332144a339c97995745cae291205ed2f9b5cc26aa9cb422",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir",
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-([\\d.]+)"
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/latest",
+        "regex": "jdk-(25[\\d.]*)"
     },
     "autoupdate": {
-        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java19-windows-amd64-$version.zip",
-        "extract_dir": "graalvm-ce-java19-$version",
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
         "hash": {
             "url": "$url.sha256"
         }

From d9e6040636ba9cd97eb65a1be8051cfd00490a8f Mon Sep 17 00:00:00 2001
From: B67687 <111849193+B67687@users.noreply.github.com>
Date: Wed, 29 Apr 2026 22:43:49 +0800
Subject: [PATCH 2/4] chore: add trailing newline

---
 bucket/graalvm.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bucket/graalvm.json b/bucket/graalvm.json
index 6fe0b3baa8e..b77a9ecff6c 100644
--- a/bucket/graalvm.json
+++ b/bucket/graalvm.json
@@ -28,3 +28,4 @@
         }
     }
 }
+

From 922aa5de72018f21895ffa2a44dcf332b89c5ed3 Mon Sep 17 00:00:00 2001
From: B67687 <111849193+B67687@users.noreply.github.com>
Date: Wed, 29 Apr 2026 22:46:27 +0800
Subject: [PATCH 3/4] fix: make checkver regex version-agnostic

CodeRabbit suggestion: change regex from jdk-(25[\d.]*) to jdk-([\d.]+)
to support future jdk-26, jdk-27, etc. releases
---
 bucket/graalvm.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bucket/graalvm.json b/bucket/graalvm.json
index b77a9ecff6c..dc8532b98a5 100644
--- a/bucket/graalvm.json
+++ b/bucket/graalvm.json
@@ -19,7 +19,7 @@
     },
     "checkver": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/latest",
-        "regex": "jdk-(25[\\d.]*)"
+        "regex": "jdk-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
@@ -28,4 +28,3 @@
         }
     }
 }
-

From 503ab4272772c9bfc37a2691bd77c40cfb8cea18 Mon Sep 17 00:00:00 2001
From: B67687 <111849193+B67687@users.noreply.github.com>
Date: Wed, 29 Apr 2026 23:40:42 +0800
Subject: [PATCH 4/4] chore: harden installer script for future archive layout
 changes

---
 bucket/graalvm.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bucket/graalvm.json b/bucket/graalvm.json
index dc8532b98a5..cdbc9065812 100644
--- a/bucket/graalvm.json
+++ b/bucket/graalvm.json
@@ -8,8 +8,10 @@
     "extract_to": "tmp",
     "installer": {
         "script": [
-            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
-            "Remove-Item -Recurse \"$dir\\tmp\""
+            "$tmp = Join-Path $dir 'tmp'",
+            "$dirs = Get-ChildItem -Directory $tmp",
+            "if ($dirs) { $dirs | ForEach-Object { Move-Item (Join-Path $_.FullName '*') $dir -Force } } else { Move-Item (Join-Path $tmp '*') $dir -Force }",
+            "Remove-Item -Recurse -Force $tmp"
         ]
     },
     "env_add_path": "bin",