Skip to content

Commit 3b544f8

Browse files
OracleLabsAutomationfniephaus
authored andcommitted
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/4568
2 parents 21a8719 + beb396d commit 3b544f8

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

ci/common.jsonnet

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ local common_json = import "../common.json";
142142

143143
common_catch_files: {
144144
catch_files+: [
145+
# There are additional catch_files-like patterns in buildbot/graal/catcher.py for:
146+
# * hs_err_pid*.log files
147+
# * Dumping IGV graphs to (?P<filename>.+(\.gv\.xml|\.bgv))
148+
# * CFGPrinter: Output to file (?P<filename>.*compilations-.+\.cfg)
149+
# There are defined there for efficiency reasons.
145150
# Keep in sync with jdk.graal.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
146151
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
147152
# Keep in sync with jdk.graal.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP

common.json

Lines changed: 8 additions & 8 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": "7.55.7",
7+
"mx_version": "7.57.1",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+2", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+2-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+2-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+3", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{
2323
"name": "regex",
2424
"subdir": True,
25-
"version": "e7523fc73be5b0307fc9d0a5ebc6386cce3d023c",
25+
"version": "6b2c0ffb789f51959cf8ef4f82935ff031c12134",
2626
"urls": [
2727
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2828
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
3131
{
3232
"name": "sulong",
3333
"subdir": True,
34-
"version": "e7523fc73be5b0307fc9d0a5ebc6386cce3d023c",
34+
"version": "6b2c0ffb789f51959cf8ef4f82935ff031c12134",
3535
"urls": [
3636
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3737
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)