Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GR-55149] Update mx on the release branch #9255

Closed
wants to merge 12 commits into from
Closed
Prev Previous commit
Next Next commit
Use --process-hidden in apply-predicates
This makes sure .dot-files are removed also at the root of the
repository if they are not explicitly included.

Preserve .clang-format for style gate

(cherry picked from commit 23afcd3)
  • Loading branch information
gilles-duboscq authored and jchalou committed Jul 8, 2024
commit d6d28ea0314def050ad5f8a584bb20dca9b8a080
3 changes: 2 additions & 1 deletion espresso/ci/ci_common/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 59,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
assert !with_native_image || with_compiler,
guard : {
includes: [
"<graal>/.git/**",
"<graal>/sdk/**",
"<graal>/truffle/**",
"<graal>/espresso/**",
Expand All @@ -77,7 78,7 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
},
setup : [
['mx', 'sversions'],
['apply-predicates', '--delete-excluded', '--pattern-root', '..'] # we are the espresso directory
['apply-predicates', '--delete-excluded', '--process-hidden', '--pattern-root', '..'] # we are the espresso directory
(if std.objectHasAll(self.guard, 'excludes') then ['--exclude=' e for e in self.guard.excludes] else [])
['--include=' e for e in self.guard.includes]
],
Expand Down
9 changes: 6 additions & 3 deletions sulong/ci/ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 18,16 @@ local sc = (import "ci_common/sulong-common.jsonnet");
],
},

gate(standalone=false):: sc.gate {
gate(standalone=false, style=false):: sc.gate {
setup : [
['apply-predicates', '--delete-excluded', '--pattern-root', '..'] # we are in the sulong directory
['apply-predicates', '--delete-excluded', '--process-hidden', '--pattern-root', '..'] # we are in the sulong directory
(if std.objectHasAll(self.guard, 'excludes') then ['--exclude=' e for e in self.guard.excludes] else [])
['--include=' e for e in self.guard.includes]
],
guard : {
includes: [
# sulong and its dependencies
"<graal>/.git/**",
"<graal>/sdk/**",
"<graal>/truffle/**",
"<graal>/sulong/**",
Expand All @@ -40,6 41,8 @@ local sc = (import "ci_common/sulong-common.jsonnet");
"<graal>/substratevm/**",
# vm and its dependencies
"<graal>/vm/**",
] else []) (if style then [
"<graal>/.clang-format",
] else []),
},
},
Expand All @@ -55,7 58,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
},

regular_builds:: [
$.sulong $.gate() sc.labsjdkLatest sc.linux_amd64 sc.style { name: "gate-sulong-style-fullbuild-jdk-latest-linux-amd64" },
$.sulong $.gate(style=true) sc.labsjdkLatest sc.linux_amd64 sc.style { name: "gate-sulong-style-fullbuild-jdk-latest-linux-amd64" },
$.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" },
$.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" },
$.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" },
Expand Down