Skip to content

Commit a02c9a3

Browse files
committed
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/3511
2 parents 33ae0fe + 4bec82c commit a02c9a3

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ local part_definitions = {
4545
},
4646

4747
packages+: {
48-
mx: "HEAD",
48+
mx: common.mx_version,
4949
python3: "==3.8.10", # For mx
5050
"pip:ninja_syntax": "==1.7.2", # Required by NFI and mx
5151
},

common.json

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
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.9.4",
5+
46
"jdks": {
57
"openjdk11": {"name": "jpg-jdk", "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },
68
"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.17+5-jvmci-22.3-b05", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.17+5-jvmci-22.3-b05-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.17+9-jvmci-22.3-b05", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.17+9-jvmci-22.3-b05-sulong", "platformspecific": true },
9+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.17+6-jvmci-23.0-b01", "platformspecific": true },
10+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.17+6-jvmci-23.0-b01-sulong", "platformspecific": true },
11+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.17+10-jvmci-23.0-b01", "platformspecific": true },
12+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.17+10-jvmci-23.0-b01-sulong", "platformspecific": true },
1113

1214
"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.5+5-jvmci-22.3-b05", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.5+5-jvmci-22.3-b05-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.5+5-jvmci-22.3-b05-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.5+8-jvmci-22.3-b05", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.5+8-jvmci-22.3-b05-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.5+8-jvmci-22.3-b05-sulong", "platformspecific": true },
15+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.5+6-jvmci-23.0-b01", "platformspecific": true },
16+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.5+6-jvmci-23.0-b01-debug", "platformspecific": true },
17+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.5+6-jvmci-23.0-b01-sulong", "platformspecific": true },
18+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.5+9-jvmci-23.0-b01", "platformspecific": true },
19+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.5+9-jvmci-23.0-b01-debug", "platformspecific": true },
20+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.5+9-jvmci-23.0-b01-sulong", "platformspecific": true },
1921

2022
"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+36-jvmci-22.3-b05", "platformspecific": true },
22-
"labsjdk-ce-19Debug": {"name": "labsjdk", "version": "ce-19+36-jvmci-22.3-b05-debug", "platformspecific": true },
23-
"labsjdk-ce-19-llvm": {"name": "labsjdk", "version": "ce-19+36-jvmci-22.3-b05-sulong", "platformspecific": true },
24-
"labsjdk-ee-19": {"name": "labsjdk", "version": "ee-19.0.1+9-jvmci-22.3-b05", "platformspecific": true },
25-
"labsjdk-ee-19Debug": {"name": "labsjdk", "version": "ee-19.0.1+9-jvmci-22.3-b05-debug", "platformspecific": true },
26-
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.1+9-jvmci-22.3-b05-sulong", "platformspecific": true }
23+
"labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19+36-jvmci-23.0-b01", "platformspecific": true },
24+
"labsjdk-ce-19Debug": {"name": "labsjdk", "version": "ce-19+36-jvmci-23.0-b01-debug", "platformspecific": true },
25+
"labsjdk-ce-19-llvm": {"name": "labsjdk", "version": "ce-19+36-jvmci-23.0-b01-sulong", "platformspecific": true },
26+
"labsjdk-ee-19": {"name": "labsjdk", "version": "ee-19.0.1+10-jvmci-23.0-b01", "platformspecific": true },
27+
"labsjdk-ee-19Debug": {"name": "labsjdk", "version": "ee-19.0.1+10-jvmci-23.0-b01-debug", "platformspecific": true },
28+
"labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.1+10-jvmci-23.0-b01-sulong", "platformspecific": true }
2729
},
2830

2931
"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)",

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": "3abb64734edf5c2f12a557ac4d5674cf27758a75",
10+
"version": "71b88590c92f2d77d1033d76687703e925f5dfff",
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": "3abb64734edf5c2f12a557ac4d5674cf27758a75",
19+
"version": "71b88590c92f2d77d1033d76687703e925f5dfff",
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)