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

PullRequest: truffleruby/4056
oracle · Nov 16, 2023 · a4a9d08 · a4a9d08
2 parents 3470023 + c2cc6d1
commit a4a9d08
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -150,6 +150,13 @@ local common_json = import "../common.json";
       } else {},
     },
 
+    black:: {
+      packages+: {
+        # black is used to format python source code
+        "pip:black": common_json.pip.black,
+      },
+    },
+
     local code_tools = {
       downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
         TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
@@ -181,12 +188,7 @@ local common_json = import "../common.json";
     graalnodejs:: {
       packages+: if self.os == "linux" then {
         cmake: "==3.22.2",
-      } + (if self.arch == "aarch64" then {
-        "00:devtoolset": "==10",
-      } else {
-        "00:devtoolset": "==11",
-      })
-      else {},
+      } else {},
     },
 
     svm:: {
@@ -203,14 +205,6 @@ local common_json = import "../common.json";
         "*/callgrind.*",
         "*.log",
       ],
-
-      packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then
-        (if self.arch == "aarch64" then {
-          "00:devtoolset": "==10",
-        } else {
-          "00:devtoolset": "==11",
-        })
-      else {},
     },
   },
 
@@ -307,6 +301,12 @@ local common_json = import "../common.json";
       mount_modules: true,
     },
   },
+  local ol8 = {
+    docker+: {
+      image: "buildslave_ol8",
+      mount_modules: true,
+    },
+  },
   local ol9 = {
     docker+: {
       image: "buildslave_ol9",
@@ -326,28 +326,39 @@ local common_json = import "../common.json";
   local deps_windows = {
   },
 
+  local ol_devtoolset = {
+    packages+: (if self.arch == "aarch64" then {
+      "00:devtoolset": "==10", # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
+    } else {
+      "00:devtoolset": "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
+    }),
+  },
+
   local linux   = deps_linux   + common + { os:: "linux",   capabilities+: [self.os] },
   local darwin  = deps_darwin  + common + { os:: "darwin",  capabilities+: [self.os] },
   local windows = deps_windows + common + { os:: "windows", capabilities+: [self.os] },
   local windows_server_2016 = windows + { capabilities+: ["windows_server_2016"] },
 
   local amd64   = { arch:: "amd64",   capabilities+: [self.arch] },
   local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
-  local ol_distro = {os_distro:: "ol"},
+  # Always include the devtoolset on Oracle Linux to use the same system toolchain for all builds
+  local ol_distro = { os_distro:: "ol" } + ol_devtoolset,
 
   linux_amd64: linux + amd64 + ol7 + ol_distro,
-  linux_amd64_ubuntu: linux + amd64 + ubuntu22 + {os_distro:: "ubuntu"},
+  linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
   linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
   linux_aarch64: linux + aarch64 + ol_distro,
+  linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
   linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
 
+  linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
+
   darwin_amd64: darwin + amd64,
   darwin_aarch64: darwin + aarch64,
 
   windows_amd64: windows + amd64,
   windows_server_2016_amd64: windows_server_2016 + amd64,
 
-
   # Utils
   disable_proxies: {
     setup+: [

diff --git a/common.json b/common.json
@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "6.53.2",
+  "mx_version": "7.0.3",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -60,6 +60,7 @@
   "pip": {
     "ninja_syntax": "==1.7.2",
     "lazy-object-proxy": "==1.6.0",
-    "pylint": "==2.4.4"
+    "pylint": "==2.4.4",
+    "black": "==23.11.0"
   }
 }
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "d24879f0f515f2cc21c318e9cd0ec3f7fd37e71b",
+                "version": "cfecf1f20818b86992a75753b455c45765313273",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "d24879f0f515f2cc21c318e9cd0ec3f7fd37e71b",
+                "version": "cfecf1f20818b86992a75753b455c45765313273",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},