Update common files

graalvm · Aug 8, 2023 · 32870d4 · 32870d4
1 parent 0aa0c4e
commit 32870d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -121,9 +121,13 @@ local common_json = import "../common.json";
 
     graalnodejs:: {
       packages+: if self.os == "linux" then {
-        "00:devtoolset": "==11",
         cmake: "==3.22.2",
-      } else {},
+      } + (if self.arch == "aarch64" then {
+        "00:devtoolset": "==10",
+      } else {
+        "00:devtoolset": "==11",
+      })
+      else {},
     },
 
     svm:: {
@@ -141,9 +145,13 @@ local common_json = import "../common.json";
         "*.log",
       ],
 
-      packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
-        "00:devtoolset": "==11",
-      } else {},
+      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 {},
     },
   },
 

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