Skip to content

Commit 4ee681e

Browse files
authored
Run transport version validation tasks on precommit (#134482) (#134492)
(cherry picked from commit 36181aa) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java
1 parent 4cd73de commit 4ee681e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package org.elasticsearch.gradle.internal.transport;
1111

1212
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
13+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
14+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1315
import org.elasticsearch.gradle.util.GradleUtils;
1416
import org.gradle.api.Plugin;
1517
import org.gradle.api.Project;
@@ -23,6 +25,7 @@ public class TransportVersionReferencesPlugin implements Plugin<Project> {
2325
@Override
2426
public void apply(Project project) {
2527
project.getPluginManager().apply(LifecycleBasePlugin.class);
28+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
2629

2730
project.getPlugins()
2831
.apply(ProjectSubscribeServicePlugin.class)
@@ -50,6 +53,6 @@ public void apply(Project project) {
5053
t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
5154
t.getReferencesFile().set(collectTask.get().getOutputFile());
5255
});
53-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
56+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
5457
}
5558
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import org.elasticsearch.gradle.Version;
1313
import org.elasticsearch.gradle.VersionProperties;
1414
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
15+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
16+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1517
import org.gradle.api.Plugin;
1618
import org.gradle.api.Project;
1719
import org.gradle.api.file.Directory;
@@ -28,6 +30,7 @@ public class TransportVersionResourcesPlugin implements Plugin<Project> {
2830
@Override
2931
public void apply(Project project) {
3032
project.getPluginManager().apply(LifecycleBasePlugin.class);
33+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
3134
var psService = project.getPlugins().apply(ProjectSubscribeServicePlugin.class).getService();
3235
var resourceRoot = getResourceRoot(project);
3336

@@ -61,7 +64,7 @@ public void apply(Project project) {
6164
t.getShouldValidateDensity().convention(true);
6265
t.getShouldValidatePrimaryIdNotPatch().convention(true);
6366
});
64-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
67+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
6568

6669
var generateManifestTask = project.getTasks()
6770
.register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {

0 commit comments

Comments
 (0)