Skip to content

Commit 4029e04

Browse files
committed
Favor running compile tasks before pre-commit (#33424)
1 parent 68aff71 commit 4029e04

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package org.elasticsearch.gradle.precommit
2121
import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask
2222
import org.gradle.api.Project
2323
import org.gradle.api.Task
24-
import org.gradle.api.artifacts.Configuration
2524
import org.gradle.api.plugins.JavaBasePlugin
2625
import org.gradle.api.plugins.quality.Checkstyle
2726
/**
@@ -70,14 +69,19 @@ class PrecommitTasks {
7069
precommitTasks.add(configureLoggerUsage(project))
7170
}
7271

72+
// We want to get any compilation error before running the pre-commit checks.
73+
project.sourceSets.all { sourceSet ->
74+
precommitTasks.each { task ->
75+
task.shouldRunAfter(sourceSet.getClassesTaskName())
76+
}
77+
}
7378

74-
Map<String, Object> precommitOptions = [
79+
return project.tasks.create([
7580
name: 'precommit',
7681
group: JavaBasePlugin.VERIFICATION_GROUP,
7782
description: 'Runs all non-test checks.',
7883
dependsOn: precommitTasks
79-
]
80-
return project.tasks.create(precommitOptions)
84+
])
8185
}
8286

8387
private static Task configureJarHell(Project project) {

0 commit comments

Comments
 (0)