Skip to content

Commit f1391c2

Browse files
committed
Update graal import
1 parent 2b40141 commit f1391c2

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

ci/common.jsonnet

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ local common_json = import "../common.json";
141141
"*.log",
142142
],
143143

144-
packages+: if self.os == "linux" && self.arch == "amd64" then {
144+
packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
145145
"00:devtoolset": "==7",
146146
"01:binutils": ">=2.34",
147-
} else if self.os == "linux" && self.arch == "aarch64" then {
147+
} else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
148148
"00:devtoolset": "==7",
149149
} else {},
150150
},
@@ -239,6 +239,12 @@ local common_json = import "../common.json";
239239
mount_modules: true,
240240
},
241241
},
242+
local ubuntu22 = {
243+
docker: {
244+
image: "buildslave_ubuntu22",
245+
mount_modules: true,
246+
},
247+
},
242248
local deps_linux = {
243249
},
244250
local deps_darwin = {
@@ -255,6 +261,7 @@ local common_json = import "../common.json";
255261
local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
256262

257263
linux_amd64: linux + amd64 + ol7,
264+
linux_amd64_ubuntu: linux + amd64 + ubuntu22,
258265
linux_aarch64: linux + aarch64,
259266

260267
darwin_amd64: darwin + amd64,

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": "9aad6f0e2b71078b7438beb4f517955b3ca013e2",
10+
"version": "b35d79c351230b70b9e32bc729c6495fe87ae838",
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": "9aad6f0e2b71078b7438beb4f517955b3ca013e2",
19+
"version": "b35d79c351230b70b9e32bc729c6495fe87ae838",
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)