Skip to content

Commit 30cf3c9

Browse files
[GR-54781] Use --process-hidden in apply-predicates.
PullRequest: graal/18064
2 parents ecc62bd + 23afcd3 commit 30cf3c9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

espresso/ci/ci_common/common.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
5959
assert !with_native_image || with_compiler,
6060
guard+: {
6161
includes: [
62+
"<graal>/.git/**",
6263
"<graal>/sdk/**",
6364
"<graal>/truffle/**",
6465
"<graal>/espresso/**",
@@ -76,7 +77,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
7677
},
7778
setup+: [
7879
['mx', 'sversions'],
79-
['apply-predicates', '--delete-excluded', '--pattern-root', '..'] # we are the espresso directory
80+
['apply-predicates', '--delete-excluded', '--process-hidden', '--pattern-root', '..'] # we are the espresso directory
8081
+ (if std.objectHasAll(self.guard, 'excludes') then ['--exclude=' + e for e in self.guard.excludes] else [])
8182
+ ['--include=' + e for e in self.guard.includes]
8283
],

sulong/ci/ci.jsonnet

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ local sc = (import "ci_common/sulong-common.jsonnet");
1818
],
1919
},
2020

21-
gate(standalone=false):: sc.gate + {
21+
gate(standalone=false, style=false):: sc.gate + {
2222
setup+: [
23-
['apply-predicates', '--delete-excluded', '--pattern-root', '..'] # we are in the sulong directory
23+
['apply-predicates', '--delete-excluded', '--process-hidden', '--pattern-root', '..'] # we are in the sulong directory
2424
+ (if std.objectHasAll(self.guard, 'excludes') then ['--exclude=' + e for e in self.guard.excludes] else [])
2525
+ ['--include=' + e for e in self.guard.includes]
2626
],
2727
guard+: {
2828
includes: [
2929
# sulong and its dependencies
30+
"<graal>/.git/**",
3031
"<graal>/sdk/**",
3132
"<graal>/truffle/**",
3233
"<graal>/sulong/**",
@@ -40,6 +41,8 @@ local sc = (import "ci_common/sulong-common.jsonnet");
4041
"<graal>/substratevm/**",
4142
# vm and its dependencies
4243
"<graal>/vm/**",
44+
] else []) + (if style then [
45+
"<graal>/.clang-format",
4346
] else []),
4447
},
4548
},
@@ -55,7 +58,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
5558
},
5659

5760
regular_builds:: [
58-
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.style + { name: "gate-sulong-style-fullbuild-jdk-latest-linux-amd64" },
61+
$.sulong + $.gate(style=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.style + { name: "gate-sulong-style-fullbuild-jdk-latest-linux-amd64" },
5962
$.sulong + $.gate(standalone=true) + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongMisc,parser") + $.sulong_test_toolchain + { name: "gate-sulong-misc-parser-jdk-latest-linux-amd64" },
6063
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-linux-amd64", timelimit: "45:00" },
6164
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-linux-amd64", timelimit: "45:00" },

0 commit comments

Comments
 (0)