Skip to content

Commit ebef274

Browse files
committed
[GR-18411] Update to latest graal
PullRequest: truffleruby/3768
2 parents cc34437 + 5698dd8 commit ebef274

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

ci/common.jsonnet

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ local common_json = import "../common.json";
3939
},
4040
for name in std.objectFields(jdks_data)
4141
} + {
42+
local latestJDKCE = self["labsjdk-ce-20"],
43+
local latestJDKEE = self["labsjdk-ee-20"],
4244
# Some convenient JDK aliases which don't require ["name"] for frequently-used JDKs
4345
labsjdk17ce: self["labsjdk-ce-17"],
4446
labsjdk17ee: self["labsjdk-ee-17"],
4547

46-
labsjdk19ce: self["labsjdk-ce-19"],
47-
labsjdk19ee: self["labsjdk-ee-19"],
48+
labsjdk20ce: latestJDKCE,
49+
labsjdk20ee: latestJDKEE,
4850

49-
labsjdk20ce: self["labsjdk-ce-20"],
50-
labsjdk20ee: self["labsjdk-ee-20"],
51+
labsjdkLatestCE: latestJDKCE,
52+
labsjdkLatestEE: latestJDKEE,
5153
},
5254

5355
# The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)

common.json

Lines changed: 2 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.18.1",
7+
"mx_version": "6.18.2",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -26,7 +26,7 @@
2626
"labsjdk-ee-19Debug": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-debug", "platformspecific": true },
2727
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
2828

29-
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
29+
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "34", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
3030
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10", "platformspecific": true },
3131
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-debug", "platformspecific": true },
3232
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+34-jvmci-23.0-b10-sulong", "platformspecific": true },

mx.truffleruby/jvm-ee-libgraal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
GRAALVM_SKIP_ARCHIVE=true
22
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
3-
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,LibGraal
3+
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,LibGraal Enterprise
44
NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler

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": "8d822ba71ee059637d9e0113b91d76e5da8f8877",
10+
"version": "e477eb5fbd805c08adabb64dd4e64ee8cb6cfe53",
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": "8d822ba71ee059637d9e0113b91d76e5da8f8877",
19+
"version": "e477eb5fbd805c08adabb64dd4e64ee8cb6cfe53",
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)