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

PullRequest: truffleruby/4556

Author: OracleLabsAutomation

ci/common.jsonnet

@@ -286,9 +286,8 @@ local common_json = import "../common.json";
         if (self.os == "linux" && self.arch == "amd64") then {
           readline: '==6.3',
           pcre2: '==10.37',
-          curl: '==7.50.1',
           gnur: '==4.0.3-gcc4.8.5-pcre2',
-        }
+        } + if (std.objectHasAll(self, 'os_distro') && self['os_distro'] == 'ol' && std.objectHasAll(self, 'os_distro_version') && self['os_distro_version'] == '9') then {curl: '==7.78.0'} else {curl: '==7.50.1'}
         else if (self.os == "darwin" && self.arch == "amd64") then {
           'pcre2': '==10.37',
         } else {},
@@ -451,18 +450,21 @@ local common_json = import "../common.json";
     local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
 
     local ol_distro = { os_distro:: "ol" },
+    local ol7_distro = ol_distro + { os_distro_version:: "7" },
+    local ol8_distro = ol_distro + { os_distro_version:: "8" },
+    local ol9_distro = ol_distro + { os_distro_version:: "9" },
 
     linux_amd64: self.linux_amd64_ol7,
-    linux_amd64_ol7: linux + amd64 + ol7 + ol_distro,
-    linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
-    linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
+    linux_amd64_ol7: linux + amd64 + ol7 + ol7_distro,
+    linux_amd64_ol8: linux + amd64 + ol8 + ol8_distro,
+    linux_amd64_ol9: linux + amd64 + ol9 + ol9_distro,
 
     linux_aarch64: self.linux_aarch64_ol7,
-    linux_aarch64_ol7: linux + aarch64 + ol7 + ol_distro,
-    linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
-    linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
+    linux_aarch64_ol7: linux + aarch64 + ol7 + ol7_distro,
+    linux_aarch64_ol8: linux + aarch64 + ol8 + ol8_distro,
+    linux_aarch64_ol9: linux + aarch64 + ol9 + ol9_distro,
 
-    linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
+    linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu", os_distro_version:: "22" },
 
     darwin_amd64: darwin + amd64,
     darwin_aarch64: darwin + aarch64,

common.json

@@ -4,11 +4,11 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.54.3",
+  "mx_version": "7.54.6",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+24-2970", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26-3156", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+24", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+24-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+24-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+25", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+25-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+25-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

mx.truffleruby/suite.py

@@ -22,7 +22,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "95f5b30108315f39a07a4738bdbde6a69704a19f",
+                "version": "70e5b13b1ff68b5eadabf37493de9911723a0765",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "95f5b30108315f39a07a4738bdbde6a69704a19f",
+                "version": "70e5b13b1ff68b5eadabf37493de9911723a0765",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},