Skip to content

Commit d84b6b2

Browse files
committed
Update graal to update mx
1 parent e39bb1b commit d84b6b2

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

ci/common.jsonnet

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,15 @@ local common_json = import "../common.json";
4242
},
4343
for name in std.objectFields(jdks_data)
4444
} + {
45-
local latestJDKCE = self["labsjdk-ce-20"],
46-
local latestJDKEE = self["labsjdk-ee-20"],
4745
# Some convenient JDK aliases which don't require ["name"] for frequently-used JDKs
4846
labsjdk17ce: self["labsjdk-ce-17"],
4947
labsjdk17ee: self["labsjdk-ee-17"],
5048

51-
labsjdk20ce: latestJDKCE,
52-
labsjdk20ee: latestJDKEE,
49+
labsjdk20ce: self["labsjdk-ce-20"],
50+
labsjdk20ee: self["labsjdk-ee-20"],
5351

54-
labsjdkLatestCE: latestJDKCE,
55-
labsjdkLatestEE: latestJDKEE,
52+
labsjdkLatestCE: self["labsjdk-ce-21"],
53+
labsjdkLatestEE: self["labsjdk-ee-21"],
5654
},
5755

5856
# The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)
@@ -65,6 +63,7 @@ local common_json = import "../common.json";
6563
"linux-jdk17": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6664
"linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6765
"linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
66+
"linux-jdk21": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
6867
},
6968

7069
# Dependencies

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": "6.27.3",
7+
"mx_version": "6.27.5",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
@@ -34,13 +34,13 @@
3434
"labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-debug", "platformspecific": true },
3535
"labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
3636

37-
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "27", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
38-
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+27-jvmci-23.1-b08", "platformspecific": true },
39-
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+27-jvmci-23.1-b08-debug", "platformspecific": true },
40-
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+27-jvmci-23.1-b08-sulong", "platformspecific": true },
41-
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+27-jvmci-23.1-b08", "platformspecific": true },
42-
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+27-jvmci-23.1-b08-debug", "platformspecific": true },
43-
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+27-jvmci-23.1-b08-sulong", "platformspecific": true },
37+
"oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "28", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
38+
"labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09", "platformspecific": true },
39+
"labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09-debug", "platformspecific": true },
40+
"labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+28-jvmci-23.1-b09-sulong", "platformspecific": true },
41+
"labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09", "platformspecific": true },
42+
"labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09-debug", "platformspecific": true },
43+
"labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21+28-jvmci-23.1-b09-sulong", "platformspecific": true },
4444

4545
"oraclejdk22": {"name": "jpg-jdk", "version": "22", "build_id": "1", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
4646
},

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": "f2f88bb722a6d10e714fa96351835a84f77d5e15",
10+
"version": "f49685115ed0669641559593242832e06a437278",
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": "f2f88bb722a6d10e714fa96351835a84f77d5e15",
19+
"version": "f49685115ed0669641559593242832e06a437278",
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)