Skip to content

Commit 79afa59

Browse files
committed
Remove/rename usages of "graal_common" in CI files
* graal_common is normally the name for ci/ci_common/common.jsonnet, but here it was used for the global common file (ci/common.jsonnet), which is very confusing. That file is normally referred as "common".
1 parent c35291a commit 79afa59

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

ci/constants.libsonnet

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
local graal_common = import "graal/ci/common.jsonnet",
2+
local common = import "graal/ci/common.jsonnet",
33

44
MX_VERSION:: "HEAD",
55

@@ -24,12 +24,12 @@
2424
},
2525

2626
TARGET:: {
27-
onDemand: graal_common.frequencies.on_demand.targets,
28-
postMerge: graal_common.frequencies.post_merge.targets,
29-
daily: graal_common.frequencies.daily.targets,
30-
weekly: graal_common.frequencies.weekly.targets,
31-
monthly: graal_common.frequencies.monthly.targets,
32-
gate: graal_common.frequencies.gate.targets,
27+
onDemand: common.frequencies.on_demand.targets,
28+
postMerge: common.frequencies.post_merge.targets,
29+
daily: common.frequencies.daily.targets,
30+
weekly: common.frequencies.weekly.targets,
31+
monthly: common.frequencies.monthly.targets,
32+
gate: common.frequencies.gate.targets,
3333
},
3434

3535
NOTIFY_GROUPS:: ["[email protected]"],

ci/python-bench.libsonnet

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(import "python-gate.libsonnet") +
22
{
3-
local graal_common = import "graal/common.json",
43
local common = import "graal/ci/ci_common/common.jsonnet",
54
local common_util = import "graal/ci/ci_common/common-utils.libsonnet",
65
local run_spec = import "graal/ci/ci_common/run-spec.libsonnet",

ci/python-gate.libsonnet

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
local graal_common = import "graal/ci/common.jsonnet",
32
local common = import "graal/ci/ci_common/common.jsonnet",
43
local common_util = import "graal/ci/ci_common/common-utils.libsonnet",
54
local run_spec = import "graal/ci/ci_common/run-spec.libsonnet",
@@ -81,7 +80,7 @@
8180
//------------------------------------------------------------------------------------------------------------------
8281
local DOWNLOADS = {
8382
common: {
84-
GRADLE_JAVA_HOME: graal_common.jdks_data["oraclejdk21"],
83+
GRADLE_JAVA_HOME: common.jdks_data["oraclejdk21"],
8584
},
8685
linux: {
8786
common: {
@@ -442,13 +441,13 @@
442441

443442
local jdk_spec = task_spec(evaluate_late({
444443
"select_graalvm_if_older_jdk": function (b)
445-
if b.jdk_version < graal_common.jdks["labsjdk-ee-latest"].jdk_version then
444+
if b.jdk_version < common.jdks["labsjdk-ee-latest"].jdk_version then
446445
{
447446
downloads+: {
448-
LATEST_JAVA_HOME: graal_common.jdks_data["labsjdk-ce-latest"],
447+
LATEST_JAVA_HOME: common.jdks_data["labsjdk-ce-latest"],
449448
}
450449
} +
451-
graal_common.jdks["graalvm-ee-" + b.jdk_version] +
450+
common.jdks["graalvm-ee-" + b.jdk_version] +
452451
{
453452
dynamic_imports+:: [],
454453
environment+: {
@@ -566,7 +565,7 @@
566565
local base_style_gate = $.graalpy_eclipse_gate + task_spec({
567566
dynamic_imports:: ["/truffle"],
568567
downloads +: {
569-
EXTRA_JAVA_HOMES: graal_common.jdks_data["labsjdk-ce-21"],
568+
EXTRA_JAVA_HOMES: common.jdks_data["labsjdk-ce-21"],
570569
},
571570
packages +: {
572571
"pip:pylint": "==2.4.4",

ci/utils.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
local const = import 'constants.libsonnet';
2-
local graal_common = import "graal/ci/common.jsonnet";
2+
local common = import "graal/ci/common.jsonnet";
33

44
{
55
// add a graal option
@@ -36,7 +36,7 @@ local graal_common = import "graal/ci/common.jsonnet";
3636

3737
ensure_no_mx_wrong_build(builds):: [
3838
b + (
39-
if std.objectHas(b, "setup") && b.jdk_version != graal_common.jdks["labsjdk-ee-latest"].jdk_version then
39+
if std.objectHas(b, "setup") && b.jdk_version != common.jdks["labsjdk-ee-latest"].jdk_version then
4040
assert (std.length([step for step in b.setup if std.length(std.find("build", step)) != 0 && std.length(std.find("mx", step)) != 0]) == 0) : b.name + " should not call build in " + b.setup;
4141
{}
4242
else

0 commit comments

Comments
 (0)