Skip to content

Commit c2cc6d1

Browse files
Update graal import.
1 parent 5ff14c3 commit c2cc6d1

File tree

3 files changed

+33
-21
lines changed

3 files changed

+33
-21
lines changed

ci/common.jsonnet

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ local common_json = import "../common.json";
150150
} else {},
151151
},
152152

153+
black:: {
154+
packages+: {
155+
# black is used to format python source code
156+
"pip:black": common_json.pip.black,
157+
},
158+
},
159+
153160
local code_tools = {
154161
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
155162
TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
@@ -181,12 +188,7 @@ local common_json = import "../common.json";
181188
graalnodejs:: {
182189
packages+: if self.os == "linux" then {
183190
cmake: "==3.22.2",
184-
} + (if self.arch == "aarch64" then {
185-
"00:devtoolset": "==10",
186-
} else {
187-
"00:devtoolset": "==11",
188-
})
189-
else {},
191+
} else {},
190192
},
191193

192194
svm:: {
@@ -203,14 +205,6 @@ local common_json = import "../common.json";
203205
"*/callgrind.*",
204206
"*.log",
205207
],
206-
207-
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then
208-
(if self.arch == "aarch64" then {
209-
"00:devtoolset": "==10",
210-
} else {
211-
"00:devtoolset": "==11",
212-
})
213-
else {},
214208
},
215209
},
216210

@@ -307,6 +301,12 @@ local common_json = import "../common.json";
307301
mount_modules: true,
308302
},
309303
},
304+
local ol8 = {
305+
docker+: {
306+
image: "buildslave_ol8",
307+
mount_modules: true,
308+
},
309+
},
310310
local ol9 = {
311311
docker+: {
312312
image: "buildslave_ol9",
@@ -326,28 +326,39 @@ local common_json = import "../common.json";
326326
local deps_windows = {
327327
},
328328

329+
local ol_devtoolset = {
330+
packages+: (if self.arch == "aarch64" then {
331+
"00:devtoolset": "==10", # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
332+
} else {
333+
"00:devtoolset": "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
334+
}),
335+
},
336+
329337
local linux = deps_linux + common + { os:: "linux", capabilities+: [self.os] },
330338
local darwin = deps_darwin + common + { os:: "darwin", capabilities+: [self.os] },
331339
local windows = deps_windows + common + { os:: "windows", capabilities+: [self.os] },
332340
local windows_server_2016 = windows + { capabilities+: ["windows_server_2016"] },
333341

334342
local amd64 = { arch:: "amd64", capabilities+: [self.arch] },
335343
local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
336-
local ol_distro = {os_distro:: "ol"},
344+
# Always include the devtoolset on Oracle Linux to use the same system toolchain for all builds
345+
local ol_distro = { os_distro:: "ol" } + ol_devtoolset,
337346

338347
linux_amd64: linux + amd64 + ol7 + ol_distro,
339-
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + {os_distro:: "ubuntu"},
348+
linux_amd64_ol8: linux + amd64 + ol8 + ol_distro,
340349
linux_amd64_ol9: linux + amd64 + ol9 + ol_distro,
341350
linux_aarch64: linux + aarch64 + ol_distro,
351+
linux_aarch64_ol8: linux + aarch64 + ol8 + ol_distro,
342352
linux_aarch64_ol9: linux + aarch64 + ol9 + ol_distro,
343353

354+
linux_amd64_ubuntu: linux + amd64 + ubuntu22 + { os_distro:: "ubuntu" },
355+
344356
darwin_amd64: darwin + amd64,
345357
darwin_aarch64: darwin + aarch64,
346358

347359
windows_amd64: windows + amd64,
348360
windows_server_2016_amd64: windows_server_2016 + amd64,
349361

350-
351362
# Utils
352363
disable_proxies: {
353364
setup+: [

common.json

Lines changed: 3 additions & 2 deletions
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.53.2",
7+
"mx_version": "7.0.3",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -60,6 +60,7 @@
6060
"pip": {
6161
"ninja_syntax": "==1.7.2",
6262
"lazy-object-proxy": "==1.6.0",
63-
"pylint": "==2.4.4"
63+
"pylint": "==2.4.4",
64+
"black": "==23.11.0"
6465
}
6566
}

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"name": "regex",
2222
"subdir": True,
23-
"version": "d24879f0f515f2cc21c318e9cd0ec3f7fd37e71b",
23+
"version": "cfecf1f20818b86992a75753b455c45765313273",
2424
"urls": [
2525
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2626
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
2929
{
3030
"name": "sulong",
3131
"subdir": True,
32-
"version": "d24879f0f515f2cc21c318e9cd0ec3f7fd37e71b",
32+
"version": "cfecf1f20818b86992a75753b455c45765313273",
3333
"urls": [
3434
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3535
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)