Skip to content

Commit dee7152

Browse files
Update graal import.
1 parent 47b0c3c commit dee7152

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

ci/common.jsonnet

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,19 @@ local common_json = import "../common.json";
217217
}
218218
},
219219

220-
local code_tools = {
220+
# ProGuard does not yet run on JDK 25
221+
proguard: {
221222
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
222-
TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
223+
TOOLS_JAVA_HOME: jdks_data['oraclejdk24'],
224+
IGV_JAVA_HOME: jdks_data['oraclejdk21'],
223225
} else {},
224226
},
225-
# GR-46676: ProGuard does not yet run on JDK 22
226-
proguard: code_tools,
227227
# GR-49566: SpotBugs does not yet run on JDK 22
228-
spotbugs: code_tools,
228+
spotbugs: {
229+
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
230+
TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
231+
} else {},
232+
},
229233

230234
sulong:: self.cmake + {
231235
packages+: if self.os == "windows" then {

common.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.54.6",
7+
"mx_version": "7.55.7",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26-3319", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-83", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -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": "25", "build_id": "jdk-26+1", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+1-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+1-jvmci-b01-sulong", "platformspecific": true }
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 }
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": "afeb9001e485779697122adbddbce521732d9140",
25+
"version": "e7523fc73be5b0307fc9d0a5ebc6386cce3d023c",
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": "afeb9001e485779697122adbddbce521732d9140",
34+
"version": "e7523fc73be5b0307fc9d0a5ebc6386cce3d023c",
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)