Synced common.json.

graalvm · Jul 27, 2023 · 3cdec03 · 3cdec03
1 parent e71c661
commit 3cdec03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -121,7 +121,7 @@ local common_json = import "../common.json";
 
     graalnodejs:: {
       packages+: if self.os == "linux" then {
-        "00:devtoolset": "==7",
+        "00:devtoolset": "==11",
         cmake: "==3.22.2",
       } else {},
     },
@@ -141,11 +141,8 @@ local common_json = import "../common.json";
         "*.log",
       ],
 
-      packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
-        "01:binutils": ">=2.34",
-      } else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==7",
+      packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
+        "00:devtoolset": "==11",
       } else {},
     },
   },

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.29.0",
+  "mx_version": "6.34.0",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {