Skip to content

Commit cd96d64

Browse files
committed
Don't import compiler suite if the base JDK is a GraalVM in Sulong jobs.
1 parent e176dc4 commit cd96d64

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

sulong/ci/ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
1212

1313
sulong:: {
1414
suite:: "sulong",
15-
extra_mx_args+:: [ "--dynamicimport", "/compiler" ],
15+
extra_mx_args+:: if self._jdkIsGraalVM then [] else [ "--dynamicimport", "/compiler" ],
1616
setup+: [
1717
["cd", "./sulong"],
1818
],

sulong/ci/ci_common/sulong-common.jsonnet

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,14 @@ local sulong_deps = common.deps.sulong;
193193
},
194194
} + {
195195

196-
[std.strReplace(name, "-", "_")]: common[name]
196+
[std.strReplace(name, "-", "_")]: common[name] + { _jdkIsGraalVM:: false }
197197
for name in std.objectFieldsAll(common)
198198
if std.startsWith(name, "labsjdk")
199199

200+
} + {
201+
202+
[name]: common[name] + { _jdkIsGraalVM:: true }
203+
for name in std.objectFieldsAll(common)
204+
if std.startsWith(name, "graalvm")
205+
200206
}

0 commit comments

Comments
 (0)