From fd3c3863cfc21fc0b274e3859b89891fdde3ba07 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Wed, 5 Sep 2018 16:24:43 +0300 Subject: [PATCH] Favor running compile tasks before pre-commit --- .../gradle/precommit/PrecommitTasks.groovy | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy index 06557d4ccfdb7..8c3fb7c7e84a2 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy @@ -21,7 +21,6 @@ package org.elasticsearch.gradle.precommit import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask import org.gradle.api.Project import org.gradle.api.Task -import org.gradle.api.artifacts.Configuration import org.gradle.api.plugins.JavaBasePlugin import org.gradle.api.plugins.quality.Checkstyle /** @@ -70,14 +69,19 @@ class PrecommitTasks { precommitTasks.add(configureLoggerUsage(project)) } + // We want to get any compilation error before running the pre-commit checks. + project.sourceSets.all { sourceSet -> + precommitTasks.each { task -> + task.shouldRunAfter(sourceSet.getClassesTaskName()) + } + } - Map precommitOptions = [ + return project.tasks.create([ name: 'precommit', group: JavaBasePlugin.VERIFICATION_GROUP, description: 'Runs all non-test checks.', dependsOn: precommitTasks - ] - return project.tasks.create(precommitOptions) + ]) } private static Task configureJarHell(Project project) {