Skip to content

Commit e4a633e

Browse files
Update graal import.
1 parent e11a36d commit e4a633e

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

common.json

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

4-
"mx_version" : "6.14.13",
4+
"mx_version" : "6.14.18",
55

66
"jdks": {
77
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
@@ -19,9 +19,12 @@
1919
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true },
2020

2121
"oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "24", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
22-
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05", "platformspecific": true },
23-
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05-debug", "platformspecific": true },
24-
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+26-jvmci-23.0-b05-sulong", "platformspecific": true }
22+
"labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06", "platformspecific": true },
23+
"labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06-debug", "platformspecific": true },
24+
"labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20+30-jvmci-23.0-b06-sulong", "platformspecific": true },
25+
"labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06", "platformspecific": true },
26+
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06-debug", "platformspecific": true },
27+
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.1+2-jvmci-23.0-b06-sulong", "platformspecific": true }
2528
},
2629

2730
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
@@ -36,7 +39,8 @@
3639

3740
"catch_files" : [
3841
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
39-
"Dumping debug output to '(?P<filename>[^']+)'"
42+
"Dumping debug output to '(?P<filename>[^']+)'",
43+
" (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)"
4044
],
4145

4246
"deps": {
@@ -104,26 +108,20 @@
104108
},
105109
"sulong": {
106110
"deps": {
107-
"common": {},
108-
"linux": {
111+
"common": {
109112
"packages": {
110-
"cmake": "==3.15.2"
113+
"cmake": "==3.22.2"
111114
}
112115
},
116+
"linux": {
117+
},
113118
"darwin_amd64": {
114-
"packages": {
115-
"cmake": "==3.15.2"
116-
}
117119
},
118120
"darwin_aarch64": {
119-
"packages": {
120-
"cmake": "==3.22.2"
121-
}
122121
},
123122
"windows": {
124123
"packages": {
125-
"msvc_source": "==14.0",
126-
"pip:cmake": "==3.18.4"
124+
"msvc_source": "==14.0"
127125
}
128126
}
129127
}
@@ -145,7 +143,7 @@
145143
"linux": {
146144
"packages": {
147145
"00:devtoolset": "==7",
148-
"cmake": "==3.15.2"
146+
"cmake": "==3.22.2"
149147
}
150148
},
151149
"darwin": {}

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": "5e6a0afe1e3b54370bd45cee9d129f256d3b002a",
10+
"version": "15807fb796282bbc975bf82cb80b95d6c5f178ef",
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": "5e6a0afe1e3b54370bd45cee9d129f256d3b002a",
19+
"version": "15807fb796282bbc975bf82cb80b95d6c5f178ef",
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)