[GR-26395] Periodic update of the graal import.

PullRequest: truffleruby/3511
oracle · Oct 10, 2022 · a02c9a3 · a02c9a3
2 parents 33ae0fe + 4bec82c
commit a02c9a3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -45,7 +45,7 @@ local part_definitions = {
       },
 
       packages+: {
-        mx: "HEAD",
+        mx: common.mx_version,
         python3: "==3.8.10", # For mx
         "pip:ninja_syntax": "==1.7.2",  # Required by NFI and mx
       },

diff --git a/common.json b/common.json
@@ -1,29 +1,31 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
+  "mx_version" : "6.9.4",
+
   "jdks": {
     "openjdk11":          {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.17+5-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.17+5-jvmci-22.3-b05-sulong", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.17+9-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.17+9-jvmci-22.3-b05-sulong", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.17+6-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.17+6-jvmci-23.0-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.17+10-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.17+10-jvmci-23.0-b01-sulong", "platformspecific": true },
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.1",  "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.5+5-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.5+5-jvmci-22.3-b05-debug", "platformspecific": true },
-    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.5+5-jvmci-22.3-b05-sulong", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.5+8-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.5+8-jvmci-22.3-b05-debug", "platformspecific": true },
-    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.5+8-jvmci-22.3-b05-sulong", "platformspecific": true },
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.5+6-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.5+6-jvmci-23.0-b01-debug", "platformspecific": true },
+    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.5+6-jvmci-23.0-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.5+9-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.5+9-jvmci-23.0-b01-debug", "platformspecific": true },
+    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.5+9-jvmci-23.0-b01-sulong", "platformspecific": true },
 
     "oraclejdk19":        {"name": "jpg-jdk",   "version": "19",      "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-19":      {"name": "labsjdk",   "version": "ce-19+36-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ce-19Debug": {"name": "labsjdk",   "version": "ce-19+36-jvmci-22.3-b05-debug", "platformspecific": true },
-    "labsjdk-ce-19-llvm": {"name": "labsjdk",   "version": "ce-19+36-jvmci-22.3-b05-sulong", "platformspecific": true },
-    "labsjdk-ee-19":      {"name": "labsjdk",   "version": "ee-19.0.1+9-jvmci-22.3-b05", "platformspecific": true },
-    "labsjdk-ee-19Debug": {"name": "labsjdk",   "version": "ee-19.0.1+9-jvmci-22.3-b05-debug", "platformspecific": true },
-    "labsjdk-ee-19-llvm": {"name": "labsjdk",   "version": "ee-19.0.1+9-jvmci-22.3-b05-sulong", "platformspecific": true }
+    "labsjdk-ce-19":      {"name": "labsjdk",   "version": "ce-19+36-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ce-19Debug": {"name": "labsjdk",   "version": "ce-19+36-jvmci-23.0-b01-debug", "platformspecific": true },
+    "labsjdk-ce-19-llvm": {"name": "labsjdk",   "version": "ce-19+36-jvmci-23.0-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-19":      {"name": "labsjdk",   "version": "ee-19.0.1+10-jvmci-23.0-b01", "platformspecific": true },
+    "labsjdk-ee-19Debug": {"name": "labsjdk",   "version": "ee-19.0.1+10-jvmci-23.0-b01-debug", "platformspecific": true },
+    "labsjdk-ee-19-llvm": {"name": "labsjdk",   "version": "ee-19.0.1+10-jvmci-23.0-b01-sulong", "platformspecific": true }
   },
 
   "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "3abb64734edf5c2f12a557ac4d5674cf27758a75",
+                "version": "71b88590c92f2d77d1033d76687703e925f5dfff",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "3abb64734edf5c2f12a557ac4d5674cf27758a75",
+                "version": "71b88590c92f2d77d1033d76687703e925f5dfff",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},