Automatic merge of master into galahad

Author: OracleLabsAutomation

espresso/ci/ci_common/common.jsonnet

@@ -59,16 +59,18 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
     assert !with_native_image || with_compiler,
     guard+: {
       includes: [
-        "<graal>/.git/**",
+        "<graal>/.git/**",  # This ensure the .git directory is preserved in apply-predicates
         "<graal>/sdk/**",
         "<graal>/truffle/**",
         "<graal>/espresso/**",
         "<graal>/tools/**",
         "<graal>/regex/**",
         "<graal>/sulong/**",
         "<graal>/pyproject.toml",
-      ] + base.basic_guard_includes + (if with_compiler then [
         "<graal>/common.json",
+        "<graal>/ci.jsonnet",
+        "<graal>/ci/**",
+      ] + base.basic_guard_includes + (if with_compiler then [
         "<graal>/compiler/**",
       ] + base.compiler_guard_includes else []) + (if with_native_image then [
         "<graal>/substratevm/**",

sulong/ci/ci.jsonnet

@@ -27,15 +27,17 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     guard+: {
       includes+: [
         # sulong and its dependencies
-        "<graal>/.git/**",
+        "<graal>/.git/**",  # This ensure the .git directory is preserved in apply-predicates
+        "<graal>/ci.jsonnet",
+        "<graal>/ci/**",
+        "<graal>/common.json",
         "<graal>/sdk/**",
         "<graal>/truffle/**",
         "<graal>/sulong/**",
         # the compiler and its dependencies
         "<graal>/compiler/**",
         "<graal>/regex/**",
         "<graal>/java-benchmarks/**",
-        "<graal>/common.json",
       ] + (if standalone then [
         # substratevm and its dependencies
         "<graal>/substratevm/**",