From 42bab0a37d506776cac32621e54e11f5abbf9a65 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 13 Oct 2025 13:50:32 -0700 Subject: [PATCH] Fix cachability of transport validation tasks (#136484) The transport version validation tasks were meant to be cachable, but since they don't output a file they aren't actually cachable. This commit fixes these tasks by making them PrecommitTasks which output a marker file on success. --- .../transport/ValidateTransportVersionReferencesTask.java | 4 ++-- .../transport/ValidateTransportVersionResourcesTask.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionReferencesTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionReferencesTask.java index c253b9583e2cf..5cda1129b53f2 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionReferencesTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionReferencesTask.java @@ -9,7 +9,7 @@ package org.elasticsearch.gradle.internal.transport; -import org.gradle.api.DefaultTask; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTask; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.Property; import org.gradle.api.services.ServiceReference; @@ -30,7 +30,7 @@ * Validates that each transport version reference has a referable definition. */ @CacheableTask -public abstract class ValidateTransportVersionReferencesTask extends DefaultTask implements VerificationTask { +public abstract class ValidateTransportVersionReferencesTask extends PrecommitTask implements VerificationTask { @ServiceReference("transportVersionResources") abstract Property getTransportResources(); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java index 3420ab0cbb639..ccbe400fcf26a 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java @@ -11,8 +11,8 @@ import com.google.common.collect.Comparators; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTask; import org.elasticsearch.gradle.internal.transport.TransportVersionResourcesService.IdAndDefinition; -import org.gradle.api.DefaultTask; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.provider.Property; import org.gradle.api.services.ServiceReference; @@ -40,7 +40,7 @@ * Validates that each defined transport version constant is referenced by at least one project. */ @CacheableTask -public abstract class ValidateTransportVersionResourcesTask extends DefaultTask implements VerificationTask { +public abstract class ValidateTransportVersionResourcesTask extends PrecommitTask implements VerificationTask { @InputDirectory @Optional