Skip to content

Commit d7b305a

Browse files
committed
chore: fix clean and publishing tasks
1 parent f2744c0 commit d7b305a

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: 🏗️ Gradle Build & Run
9191
id: gradle-build
9292
run: |
93-
./gradlew ciBuild
93+
./gradlew buildAndPublish
9494
echo "dist_path=$(ls -1 backend/build/distributions/*.zip | head -n 1)" >> "$GITHUB_OUTPUT"
9595
echo "dist_name=$(ls -1 backend/build/distributions/*.zip | head -n 1 | xargs basename)" >> "$GITHUB_OUTPUT"
9696
env:

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $ sdk u java 22.ea-open
2525
### Build & Run
2626

2727
```bash
28-
$ ./gradlew ciBuild
28+
$ ./gradlew buildAndPublish
2929
```
3030

3131
<details>
@@ -46,6 +46,10 @@ $ ./gradlew :benchmarks:benchmark
4646
$ ./gradlew :backend:listResolvedArtifacts
4747
$ ./gradlew createModuleGraph
4848

49+
# Misc
50+
$ ./gradlew checkBuildLogicBestPractices
51+
$ ./gradlew cleanAll
52+
4953
# GitHub Actions lint
5054
$ actionlint
5155
```
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
plugins { alias(libs.plugins.benmanes) }
22

3-
tasks.dependencyUpdates { checkConstraints = true }
3+
tasks {
4+
dependencyUpdates { checkConstraints = true }
5+
6+
register("clean") {
7+
group = "build"
8+
description = "Cleans all projects"
9+
subprojects.mapNotNull { it.tasks.findByName("clean") }.forEach { dependsOn(it) }
10+
doLast { delete(layout.buildDirectory) }
11+
}
12+
}

gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,23 +153,15 @@ tasks {
153153
// Set GitHub workflow action output for this build
154154
build { finalizedBy(githubActionOutput) }
155155

156-
register("ciBuild") {
157-
description = "Build with all the reports!"
158-
val publish = GithubAction.isTagBuild && Platform.isLinux
159-
val ciBuildTasks = buildList {
160-
add(tasks.build)
161-
add(":web:build")
162-
add(":backend:build")
163-
add("koverHtmlReport")
164-
add("dokkaHtmlMultiModule")
165-
if (publish) {
166-
logger.lifecycle("Publishing task is enabled for this build!")
167-
finalizedBy("publishAllPublicationsToGitHubPackagesRepository")
168-
}
156+
val buildAndPublish by registering {
157+
dependsOn(subprojects.map { it.tasks.build })
158+
dependsOn(":dokkaHtmlMultiModule", ":koverHtmlReport")
159+
160+
val publish = Platform.isLinux
161+
if (publish) {
162+
logger.lifecycle("Publishing task is enabled for this build!")
163+
subprojects.mapNotNull { it.tasks.findByName("publish") }.forEach { dependsOn(it) }
169164
}
170-
dependsOn(*ciBuildTasks.toTypedArray())
171-
named("koverHtmlReport").map { it.mustRunAfter(tasks.build) }
172-
named("dokkaHtmlMultiModule").map { it.mustRunAfter(tasks.build) }
173165
}
174166

175167
// Task to print the project version

gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ tasks {
9191
register("cleanAll") {
9292
description = "Clean all composite builds"
9393
group = LifecycleBasePlugin.CLEAN_TASK_NAME
94-
gradle.includedBuilds.forEach { dependsOn(it.task(":clean")) }
94+
dependsOn(gradle.includedBuilds.map { it.task(":clean") })
95+
dependsOn(subprojects.map { it.tasks.clean })
9596
}
9697

9798
wrapper {

0 commit comments

Comments
 (0)