Skip to content

Commit 3b76d4b

Browse files
eregoneregon
committed
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3426
2 parents e01a773 + 2690da5 commit 3b76d4b

File tree

2 files changed

+34
-15
lines changed

2 files changed

+34
-15
lines changed

‎common.json

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,38 @@
22
"README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
33

44
"jdks": {
5-
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
6-
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.16+7-jvmci-22.2-b04", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.16+7-jvmci-22.2-b04-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+10-jvmci-22.2-b04", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+10-jvmci-22.2-b04-sulong", "platformspecific": true },
5+
"openjdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },
6+
"oraclejdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.16+7-jvmci-22.3-b01", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.16+7-jvmci-22.3-b01-sulong", "platformspecific": true },
9+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+10-jvmci-22.3-b01", "platformspecific": true },
10+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+10-jvmci-22.3-b01-sulong", "platformspecific": true },
1111

12-
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.2-b04", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.2-b04-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.2-b04-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.2-b04", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.2-b04-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.2-b04-sulong", "platformspecific": true }
12+
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.1", "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.3-b01", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.3-b01-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.4+7-jvmci-22.3-b01-sulong", "platformspecific": true },
16+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.3-b01", "platformspecific": true },
17+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.3-b01-debug", "platformspecific": true },
18+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+10-jvmci-22.3-b01-sulong", "platformspecific": true },
19+
20+
"oraclejdk19": {"name": "jpg-jdk", "version": "19", "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
21+
"labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19+27-jvmci-22.3-b01", "platformspecific": true },
22+
"labsjdk-ce-19Debug": {"name": "labsjdk", "version": "ce-19+27-jvmci-22.3-b01-debug", "platformspecific": true },
23+
"labsjdk-ce-19-llvm": {"name": "labsjdk", "version": "ce-19+27-jvmci-22.3-b01-sulong", "platformspecific": true },
24+
"labsjdk-ee-19": {"name": "labsjdk", "version": "ee-19.0.1+0-jvmci-22.3-b01", "platformspecific": true },
25+
"labsjdk-ee-19Debug": {"name": "labsjdk", "version": "ee-19.0.1+0-jvmci-22.3-b01-debug", "platformspecific": true },
26+
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.1+0-jvmci-22.3-b01-sulong", "platformspecific": true },
27+
28+
"jdk-19-ea": {
29+
"build_id": "jdk-19+28",
30+
"name": "jpg-jdk",
31+
"version": "19",
32+
"extrabundles": [
33+
"static_libs"
34+
],
35+
"platformspecific": true
36+
}
1937
},
2038

2139
"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)",
@@ -142,6 +160,7 @@
142160
}
143161
},
144162
"svm": {
163+
"COMMENT.deps": "Please use svm_deps in common.jsonnet instead (the values below are without the repository-specific dependencies).",
145164
"deps": {
146165
"COMMENT.common": "graal/vm/ci_common/common.jsonnet hardcodes the properties of this object",
147166
"common": {

‎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": "f00f377618094dd82fdf56ed3cdff94c2f7f7cb5",
10+
"version": "b88169591648307251188c4f063536a7905b18bc",
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": "f00f377618094dd82fdf56ed3cdff94c2f7f7cb5",
19+
"version": "b88169591648307251188c4f063536a7905b18bc",
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)