Skip to content

Commit a9eaa9e

Browse files
committed
Update graal import
1 parent 9a849dc commit a9eaa9e

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

ci/common.jsonnet

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ local common_json = import "../common.json";
121121

122122
graalnodejs:: {
123123
packages+: if self.os == "linux" then {
124-
"00:devtoolset": "==7",
124+
"00:devtoolset": "==11",
125125
cmake: "==3.22.2",
126126
} else {},
127127
},
@@ -141,11 +141,8 @@ local common_json = import "../common.json";
141141
"*.log",
142142
],
143143

144-
packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
145-
"00:devtoolset": "==7",
146-
"01:binutils": ">=2.34",
147-
} else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
148-
"00:devtoolset": "==7",
144+
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
145+
"00:devtoolset": "==11",
149146
} else {},
150147
},
151148
},

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "6.29.0",
7+
"mx_version": "6.34.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"name": "regex",
99
"subdir": True,
10-
"version": "b35d79c351230b70b9e32bc729c6495fe87ae838",
10+
"version": "dd2391474d1671e8790d79c6ab7004c2a1d601bb",
1111
"urls": [
1212
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1313
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
1616
{
1717
"name": "sulong",
1818
"subdir": True,
19-
"version": "b35d79c351230b70b9e32bc729c6495fe87ae838",
19+
"version": "dd2391474d1671e8790d79c6ab7004c2a1d601bb",
2020
"urls": [
2121
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2222
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)