[GR-66741] Update the known runtimes for Espresso and add jdk 25 versions to mx fetch-jdk.

PullRequest: graal/21299

Author: javeleon

ci/common.jsonnet

@@ -57,6 +57,9 @@ local common_json = import "../common.json";
     for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
   } + {
     'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
+  } + {
+    [name]: jdk_base + common_json.jdks[name] + { jdk_version:: 25 }
+    for name in ["oraclejdk25"] + variants("labsjdk-ce-25") + variants("labsjdk-ee-25")
   } + {
     [name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
     for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")

common.json

@@ -45,6 +45,14 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
+    "oraclejdk25":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-25":      {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-25Debug": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-25-llvm": {"name": "labsjdk",   "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-25":      {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
+
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+4", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+4-jvmci-b01", "platformspecific": true },
     "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+4-jvmci-b01-debug", "platformspecific": true },

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java

@@ -654,7 +654,7 @@ public static Path getEspressoLibs(TruffleLanguage.Env env) {
         }
     }
 
-    private static final String[] KNOWN_ESPRESSO_RUNTIMES = {"jdk21", "openjdk21"};
+    private static final String[] KNOWN_ESPRESSO_RUNTIMES = {"jdk25", "openjdk25", "jdk21", "openjdk21", "jdk" + JavaVersion.HOST_VERSION, "openjdk" + JavaVersion.HOST_VERSION};
     private static final Pattern VALID_RESOURCE_ID = Pattern.compile("[0-9a-z\\-]+");
 
     public static Path getEspressoRuntime(TruffleLanguage.Env env) {