Skip to content

Commit 4f692ec

Browse files
timfeltimfel
committed
Sync CI files with graal
1 parent f1bb28f commit 4f692ec

File tree

4 files changed

+17
-46
lines changed

4 files changed

+17
-46
lines changed

‎ci/graal/ci/ci_common/common-utils.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Adds a CI build predicate to `build` if it is a gate such that it is only
2626
# run if a top level CI file or a non-documentation file in any of `suites` has been updated
2727
add_gate_predicate(build, suites, extra_includes=[], extra_excludes=[])::
28-
if std.member(build.targets, "gate") || std.member(build.targets, "tier1") || std.member(build.targets, "tier2") || std.member(build.targets, "tier3") then
28+
if std.member(build.targets, "gate") then
2929
build + {
3030
guard+: {
3131
includes+: [ suite + "/**" for suite in suites ] + extra_includes + $.top_level_ci,

‎ci/graal/ci/common.jsonnet‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ local common_json = import "../common.json";
5757
for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
5858
} + {
5959
'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
60-
} + {
61-
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: 25 }
62-
for name in ["oraclejdk25"] + variants("labsjdk-ce-25") + variants("labsjdk-ee-25")
6360
} + {
6461
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
6562
for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
@@ -145,11 +142,6 @@ local common_json = import "../common.json";
145142

146143
common_catch_files: {
147144
catch_files+: [
148-
# There are additional catch_files-like patterns in buildbot/graal/catcher.py for:
149-
# * hs_err_pid*.log files
150-
# * Dumping IGV graphs to (?P<filename>.+(\.gv\.xml|\.bgv))
151-
# * CFGPrinter: Output to file (?P<filename>.*compilations-.+\.cfg)
152-
# There are defined there for efficiency reasons.
153145
# Keep in sync with jdk.graal.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
154146
"Graal diagnostic output saved in '(?P<filename>[^']+)'",
155147
# Keep in sync with jdk.graal.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP
@@ -225,19 +217,15 @@ local common_json = import "../common.json";
225217
}
226218
},
227219

228-
# ProGuard does not yet run on JDK 25
229-
proguard: {
230-
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
231-
TOOLS_JAVA_HOME: jdks_data['oraclejdk24'],
232-
IGV_JAVA_HOME: jdks_data['oraclejdk21'],
233-
} else {},
234-
},
235-
# GR-49566: SpotBugs does not yet run on JDK 22
236-
spotbugs: {
220+
local code_tools = {
237221
downloads+: if 'jdk_version' in self && self.jdk_version > 21 then {
238222
TOOLS_JAVA_HOME: jdks_data['oraclejdk21'],
239223
} else {},
240224
},
225+
# GR-46676: ProGuard does not yet run on JDK 22
226+
proguard: code_tools,
227+
# GR-49566: SpotBugs does not yet run on JDK 22
228+
spotbugs: code_tools,
241229

242230
sulong:: self.cmake + {
243231
packages+: if self.os == "windows" then {
@@ -366,15 +354,6 @@ local common_json = import "../common.json";
366354
# Job frequencies
367355
# ***************
368356
frequencies: {
369-
tier1: {
370-
targets+: ["tier1"],
371-
},
372-
tier2: {
373-
targets+: ["tier2"],
374-
},
375-
tier3: {
376-
targets+: ["tier3"],
377-
},
378357
gate: {
379358
targets+: ["gate"],
380359
},

‎ci/graal/common.json‎

Lines changed: 9 additions & 17 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.54.5",
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-26+6-570", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26-3156", "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,21 +45,13 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-25": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-25Debug": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-25-llvm": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
55-
56-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+6", "platformspecific": true, "extrabundles": ["static-libs"]},
57-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01", "platformspecific": true },
58-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01-debug", "platformspecific": true },
59-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
60-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01", "platformspecific": true },
61-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01-debug", "platformspecific": true },
62-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+30", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+30-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true }
6355
},
6456

6557
"eclipse": {

‎mx.graalpython/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "e6f58afff5e5e9e0f2b3cc8f733aeff2724507ec",
56+
"version": "9733142a0ecc145aa69c61bc6d81443636a4edd4",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "e6f58afff5e5e9e0f2b3cc8f733aeff2724507ec",
64+
"version": "9733142a0ecc145aa69c61bc6d81443636a4edd4",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)