Skip to content

Commit ea81d23

Browse files
committed
Use the correct EE labsjdk for EE CI jobs and do not use graal common at all
* Use the global common instead. * Fixes using the correct EE labsjdk for EE CI jobs. * Remove extra unnecessary additions from the graal common: local graal_common_extras = common.deps.pylint + common.deps.black + { logs+: [ "*.bgv", "*/graal_dumps/*/*", ], timelimit: "30:00", }, local linux_deps_extras = { packages+: { "apache/ant": ">=1.9.4", }, },
1 parent 79afa59 commit ea81d23

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
GPY_RELEASE[self.os].url,
330330
]
331331
],
332-
"logs"+: [
332+
logs+: [
333333
"wheelhouse/*.whl",
334334
],
335335
}),

ci/python-bench.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(import "python-gate.libsonnet") +
22
{
3-
local common = import "graal/ci/ci_common/common.jsonnet",
3+
local common = import "graal/ci/common.jsonnet",
44
local common_util = import "graal/ci/ci_common/common-utils.libsonnet",
55
local run_spec = import "graal/ci/ci_common/run-spec.libsonnet",
66
local tools = import "graal/ci/ci_common/run-spec-tools.libsonnet",

ci/python-gate.libsonnet

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
local common = import "graal/ci/ci_common/common.jsonnet",
2+
local common = import "graal/ci/common.jsonnet",
33
local common_util = import "graal/ci/ci_common/common-utils.libsonnet",
44
local run_spec = import "graal/ci/ci_common/run-spec.libsonnet",
55
local tools = import "graal/ci/ci_common/run-spec-tools.libsonnet",
@@ -26,10 +26,8 @@
2626
//
2727
// -----------------------------------------------------------------------------------------------------------------
2828
local jdk_name_to_dict = {[edition]: {
29-
"jdk17"+: common.labsjdk17,
30-
"jdk20"+: common.labsjdk20,
31-
"jdk21"+: common.labsjdk21,
32-
"jdk-latest"+: common.labsjdkLatest,
29+
"jdk21"+: common.jdks["labsjdk-" + edition + "-21"],
30+
"jdk-latest"+: common.jdks["labsjdk-" + edition + "-latest"],
3331
} for edition in ['ce', 'ee']},
3432

3533
local jdk_name_to_devkit_suffix = function(name)

0 commit comments

Comments
 (0)