Skip to content

Commit 57e36df

Browse files
committed
Update graal import
1 parent 3c94bfd commit 57e36df

File tree

4 files changed

+8
-30
lines changed

4 files changed

+8
-30
lines changed

ci/graal/ci/ci_common/common.jsonnet

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ common + common.frequencies + {
128128
"*.bgv",
129129
"*/graal_dumps/*/*",
130130
],
131-
timelimit: "30:00",
132131
},
133132
local linux_deps_extras = {
134133
packages+: {

ci/graal/ci/ci_common/run-spec-tools.libsonnet

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,9 @@ local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
5454
local table = [ ["name", "variant", task_details_title] + platform_titles] + cols;
5555
table
5656
,
57-
// Removes the 'timelimit' property from an object.
58-
// Usually, this is used to remove hard-coded (default) timelimits defined in `ci/ci_common/common.jsonnet`.
59-
// These definitions assume that the os/arch definition comes first and will be refined later.
60-
// With run-spec, however, this is not true in general because the os/arch is only fixed later
61-
// in the pipeline. Thus, hard-coded timelimits would override any previous settings. To resolve
62-
// this, we delete the default value altogether and explicitly set the timelimits for all jobs.
63-
//
64-
// Implementation note: we cannot set the value to `null` and use `std.prune` because that deletes hidden fields.
65-
delete_timelimit(b)::
66-
local public_fields = std.objectFields(b);
67-
std.foldl(function(acc, k) acc +
68-
local value = b[k];
69-
if std.member(public_fields, k) then
70-
if std.type(value) == "string" then
71-
{ [k]: value }
72-
else
73-
{ [k]+: value }
74-
else
75-
if std.type(value) == "string" then
76-
{ [k]:: value }
77-
else
78-
{ [k]+:: value }
79-
,
80-
[k for k in std.objectFieldsAll(b) if k != "timelimit"],
81-
{}
82-
),
57+
// Check there is no 'timelimit' property on an object,
58+
// so that it is safe to add the timelimit later and ordering won't matter.
59+
check_no_timelimit(b)::
60+
assert !std.objectHasAll(b, "timelimit") : "b";
61+
b,
8362
}

ci/python-gate.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
// this starts with _ on purpose so that it will be evaluated first
5858
"_1_os_arch_jdk": function(b)
5959
local edition = if (std.objectHasAll(b, 'graalvm_edition')) then b.graalvm_edition else 'ce';
60-
tools.delete_timelimit(jdk_name_to_dict[edition][b.jdk] + default_os_arch(b.jdk, edition)[b.os][b.arch])
60+
tools.check_no_timelimit(jdk_name_to_dict[edition][b.jdk] + default_os_arch(b.jdk, edition)[b.os][b.arch])
6161
})),
6262

6363
//------------------------------------------------------------------------------------------------------------------

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": "fd29b2e0ab7b3f341aedf9ee4dbffd2c21769592",
56+
"version": "9edea91c00d8939fa75c2703165941e7b802e080",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "fd29b2e0ab7b3f341aedf9ee4dbffd2c21769592",
64+
"version": "9edea91c00d8939fa75c2703165941e7b802e080",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)