1
0
Эх сурвалжийг харах

Ensure precommit runs as part of check (#59476)

Precommit is setup to run as a dependency of the check task, but
unfortunately this wiring was only happening when the java plugin (but
not java-base plugin) was applied. This commit moves the wiring to occur
whenever the check task exists, which is with the lifecycle-base plugin.
Ryan Ernst 5 жил өмнө
parent
commit
546eae9d30

+ 7 - 4
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PrecommitPlugin.java

@@ -66,10 +66,13 @@ public abstract class PrecommitPlugin implements Plugin<Project> {
                 t.setDescription("Runs all non-test checks");
             });
 
-            project.getPluginManager().withPlugin("java", p -> {
-                project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(precommit));
-                project.getTasks().withType(Test.class).configureEach(t -> t.mustRunAfter(precommit));
-            });
+            project.getPluginManager()
+                .withPlugin(
+                    "lifecycle-base",
+                    p -> project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(precommit))
+                );
+            project.getPluginManager()
+                .withPlugin("java", p -> project.getTasks().withType(Test.class).configureEach(t -> t.mustRunAfter(precommit)));
         }
     }
 }