Skip to content

Commit 837f026

Browse files
OracleLabsAutomationfniephaus
OracleLabsAutomation
authored and
fniephaus
committed
[GR-26395] Periodic update of the graal import.
PullRequest: truffleruby/4588
2 parents 070d3bc + a8c2626 commit 837f026

File tree

3 files changed

+45
-14
lines changed

3 files changed

+45
-14
lines changed

‎ci/common.jsonnet

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ local common_json = import "../common.json";
6565
for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
6666
} + {
6767
'graalvm-ee-21': jdk_base + common_json.jdks["graalvm-ee-21"] + { jdk_version:: 21 },
68+
'graalvm-ee-25-ea': jdk_base + common_json.jdks["graalvm-ee-25-ea"] + { jdk_version:: 25 },
6869
},
6970
# We do not want to expose galahad-jdk
7071
assert std.assertEqual([x for x in std.objectFields(common_json.jdks) if x != "galahad-jdk"], std.objectFields(jdks_data)),
@@ -109,7 +110,8 @@ local common_json = import "../common.json";
109110
oraclejdkLatest: self["oraclejdk-latest"],
110111
},
111112

112-
# The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)
113+
# The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js).
114+
# See deps.windows_devkit to add a devkit on windows conveniently.
113115
devkits: {
114116
"windows-jdk17": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
115117
"windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
@@ -174,6 +176,12 @@ local common_json = import "../common.json";
174176

175177
# These dependencies are not included by default in any platform object
176178

179+
# Not included by default in $.windows_amd64 and $.windows_server_2016_amd64 because it needs jdk_name.
180+
# As a note, Native Image needs this to build.
181+
windows_devkit:: {
182+
packages+: if self.os == "windows" then $.devkits["windows-" + self.jdk_name].packages else {},
183+
},
184+
177185
eclipse: {
178186
downloads+: {
179187
ECLIPSE: {
@@ -239,6 +247,29 @@ local common_json = import "../common.json";
239247
} else {},
240248
},
241249

250+
maven:: {
251+
local this = self,
252+
packages+: (if self.os == "linux" && self.arch == "amd64" then {
253+
maven: '==3.9.10',
254+
} else {}),
255+
# no maven package available on other platforms
256+
downloads+: (if self.os != "linux" || self.arch != "amd64" then {
257+
# GR-68921: 3.9.10 does not work on Windows
258+
MAVEN_HOME: {name: 'maven', version: (if this.os == "windows" then '3.3.9' else '3.9.10'), platformspecific: false},
259+
} else {}),
260+
setup+: (if self.os != "linux" || self.arch != "amd64" then [
261+
['set-export', 'PATH', (if self.os == "windows" then '$MAVEN_HOME\\bin;$PATH' else '$MAVEN_HOME/bin:$PATH')],
262+
] else []),
263+
},
264+
265+
espresso:: {
266+
downloads+: {
267+
EXTRA_JAVA_HOMES+: {
268+
pathlist+: [jdks_data["oraclejdk21"], jdks_data["oraclejdk25"]],
269+
}
270+
}
271+
},
272+
242273
sulong:: self.cmake + {
243274
packages+: if self.os == "windows" then {
244275
msvc_source: "==14.0",
@@ -275,12 +306,11 @@ local common_json = import "../common.json";
275306
} else {},
276307
},
277308

278-
graalpy:: self.gradle + self.cmake + {
309+
graalpy:: self.gradle + self.cmake + self.maven + {
279310
packages+: if (self.os == "linux") then {
280311
libffi: '==3.2.1',
281312
bzip2: '==1.0.6',
282313
zlib: '==1.2.11',
283-
maven: "==3.6.3",
284314
} else {},
285315
},
286316

‎common.json

Lines changed: 10 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.58.9",
7+
"mx_version": "7.59.0",
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": "26", "build_id": "jdk-26+10-1012", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+11-1117", "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 },
@@ -52,14 +52,15 @@
5252
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
55+
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "35", "platformspecific": true },
5556

56-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+10", "platformspecific": true, "extrabundles": ["static-libs"]},
57-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01", "platformspecific": true },
58-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01-debug", "platformspecific": true },
59-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+10-jvmci-b01-sulong", "platformspecific": true },
60-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01", "platformspecific": true },
61-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01-debug", "platformspecific": true },
62-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+10-jvmci-b01-sulong", "platformspecific": true }
57+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+12", "platformspecific": true, "extrabundles": ["static-libs"]},
58+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01", "platformspecific": true },
59+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-debug", "platformspecific": true },
60+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-sulong", "platformspecific": true },
61+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01", "platformspecific": true },
62+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-debug", "platformspecific": true },
63+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-sulong", "platformspecific": true }
6364
},
6465

6566
"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": "bf93eb7ebf60a975203a55c243c00055ef572c06",
25+
"version": "4b023a1e5a4974cf20963063c757daadcb6c2e73",
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": "bf93eb7ebf60a975203a55c243c00055ef572c06",
34+
"version": "4b023a1e5a4974cf20963063c757daadcb6c2e73",
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)