Skip to content

Small tweaks to the build script #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 24, 2022
Merged

Small tweaks to the build script #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba93ee
Clarify the input declarations to the Shellcheck task
jthurne Jan 24, 2022
b5a0a72
Move assemble tasks to the build group
jthurne Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ tasks.register<Task>("copyScripts") {
}

val assembleGradleScripts = tasks.register<Zip>("assembleGradleScripts") {
group = "distribution"
group = "build"
description = "Packages the Gradle experiment scripts in a zip archive."
archiveBaseName.set("gradle-enterprise-gradle-build-validation")
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion()}.zip")
Expand All @@ -157,7 +157,7 @@ val assembleGradleScripts = tasks.register<Zip>("assembleGradleScripts") {
}

val assembleMavenScripts = tasks.register<Zip>("assembleMavenScripts") {
group = "distribution"
group = "build"
description = "Packages the Maven experiment scripts in a zip archive."
archiveBaseName.set("gradle-enterprise-maven-build-validation")
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion()}.zip")
Expand All @@ -173,13 +173,15 @@ tasks.named("assemble") {
tasks.register<Shellcheck>("shellcheckGradleScripts") {
group = "verification"
description = "Perform quality checks on Gradle build validation scripts using Shellcheck."
inputs.files(copyGradleScripts.get().outputs.files.asFileTree.matching {
include("**/*.sh")
})
sourceFiles = copyGradleScripts.get().outputs.files.asFileTree.matching {
include("**/*.sh")
// scripts in lib/ are checked when Shellcheck checks the top-level scripts because the top-level scripts include (source) the scripts in lib/
exclude("lib/")
}
// scripts in lib/ are still inputs to this task (we want shellcheck to run if they change) even though we don't include them explicitly in sourceFiles
inputs.files(copyGradleScripts.get().outputs.files.asFileTree.matching {
include("lib/**/*.sh")
})
workingDir = layout.buildDirectory.file("scripts/gradle").get().asFile
reports {
html.outputLocation.set(layout.buildDirectory.file("reports/shellcheck-gradle/shellcheck.html"))
Expand All @@ -191,13 +193,15 @@ tasks.register<Shellcheck>("shellcheckGradleScripts") {
tasks.register<Shellcheck>("shellcheckMavenScripts") {
group = "verification"
description = "Perform quality checks on Maven build validation scripts using Shellcheck."
inputs.files(copyMavenScripts.get().outputs.files.asFileTree.matching {
include("**/*.sh")
})
sourceFiles = copyMavenScripts.get().outputs.files.asFileTree.matching {
include("**/*.sh")
// scripts in lib/ are checked when Shellcheck checks the top-level scripts because the top-level scripts include (source) the scripts in lib/
exclude("lib/")
}
// scripts in lib/ are still inputs to this task (we want shellcheck to run if they change) even though we don't include them explicitly in sourceFiles
inputs.files(copyMavenScripts.get().outputs.files.asFileTree.matching {
include("lib/**/*.sh")
})
workingDir = layout.buildDirectory.file("scripts/maven").get().asFile
reports {
html.outputLocation.set(layout.buildDirectory.file("reports/shellcheck-maven/shellcheck.html"))
Expand Down