[GR-5369] Periodic update of the Graal import.

PullRequest: fastr/2908
ConnectionMaster · Jun 10, 2024 · 6d8cba5 · 6d8cba5
2 parents a75c88a + 71d6cc7
commit 6d8cba5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -60,6 +60,8 @@ local common_json = import "../common.json";
   } + {
     [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")
+  } + {
+    'graalvm-ee-21': jdk_base + common_json.jdks["graalvm-ee-21"] + { jdk_version:: 21 },
   },
   # We do not want to expose galahad-jdk
   assert std.assertEqual([x for x in std.objectFields(common_json.jdks) if x != "galahad-jdk"], std.objectFields(jdks_data)),
@@ -148,6 +150,8 @@ local common_json = import "../common.json";
         " (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)",
         # Keep in sync with jdk.graal.compiler.test.SubprocessUtil#makeArgfile
         "@(?P<filename>.*SubprocessUtil-argfiles.*\\.argfile)",
+        # Keep in sync with com.oracle.truffle.api.test.SubprocessTestUtils#makeArgfile
+        "@(?P<filename>.*SubprocessTestUtils-argfiles.*\\.argfile)",
       ],
     },
 
@@ -220,17 +224,31 @@ local common_json = import "../common.json";
     truffleruby:: {
       packages+: (if self.os == "linux" && self.arch == "amd64" then {
         ruby: "==3.2.2", # Newer version, also used for benchmarking
-      } else {
+      } else if (self.os == "windows") then
+        error('truffleruby is not supported on windows')
+      else {
         ruby: "==3.0.2",
       }) + (if self.os == "linux" then {
         libyaml: "==0.2.5",
       } else {}),
     },
 
     graalnodejs:: {
+      local this = self,
       packages+: if self.os == "linux" then {
         cmake: "==3.22.2",
       } else {},
+      environment+: if self.os == "windows" then {
+        local devkits_version = std.filterMap(
+          function(p) std.startsWith(p, 'devkit:VS'),  # filter function
+          function(p) std.substr(p, std.length('devkit:VS'), 4),  # map function
+          std.objectFields(this.packages)  # array
+        )[0],
+        DEVKIT_VERSION: devkits_version,  # TODO: dep of Graal.nodejs
+      } else {},
+      downloads+: if self.os == "windows" then {
+        NASM: {name: 'nasm', version: '2.14.02', platformspecific: true},
+      } else {},
     },
 
     graalpy:: {

diff --git a/common.json b/common.json
@@ -4,11 +4,11 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.25.0",
+  "mx_version": "7.25.5",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+20-1618", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25-2038", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
 
@@ -43,14 +43,15 @@
     "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33", "platformspecific": true },
     "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-debug", "platformspecific": true },
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
+    "graalvm-ee-21":      {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+22", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+22-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+22-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+22-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+22-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+22-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+22-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
@@ -10,7 +10,7 @@
                "subdir" : True,
                # The version must be the same as the version of Sulong
                # TRUFFLE REVISION (note: this is a marker for script that can update this)
-               "version" : "7fdb9c3dbecef24046ee0437e5251b4a7816f74d",
+               "version" : "11f7b2aa55277324decc1377ca06eb61443c4d23",
                "urls" : [
                     {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -21,7 +21,7 @@
                "subdir" : True,
                # The version must be the same as the version of Truffle
                # TRUFFLE REVISION (note: this is a marker for script that can update this)
-               "version" : "7fdb9c3dbecef24046ee0437e5251b4a7816f74d",
+               "version" : "11f7b2aa55277324decc1377ca06eb61443c4d23",
                "urls" : [
                     {"url" : "https://github.com/graalvm/graal", "kind" : "git"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},