Skip to content

Commit

Permalink
[CALCITE-5812] Gradle tasks fails when creating the javadoc aggregation
Browse files Browse the repository at this point in the history
Exclude "bom" project from the javadoc aggregation since it does not
have "main" and "test" objects causing "tasks" to fail.

Close #222
  • Loading branch information
Richard Antal authored and zabetak committed Jun 30, 2023
1 parent fc6ce0c commit be8b99a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
fetch-depth: 50
- name: 'Test'
run: |
./gradlew --no-parallel --no-daemon build javadoc -Pcheckstyle.version=9.3
./gradlew --no-parallel --no-daemon tasks build javadoc -Pcheckstyle.version=9.3
linux-jdk8-avatica:
name: 'Linux (JDK 8), Avatica main'
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
fetch-depth: 50
- name: 'Test'
run: |
./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} build
./gradlew --no-parallel --no-daemon -Pguava.version=${GUAVA:-14.0.1} tasks build
linux-jdk11-middle-aged-guava:
name: 'Linux (JDK 11), Middle-Aged Guava'
Expand Down Expand Up @@ -202,4 +202,4 @@ jobs:
distribution: 'zulu'
- name: 'Test'
run: |
./gradlew --no-parallel --no-daemon build javadoc
./gradlew --no-parallel --no-daemon tasks build javadoc
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
description = "Generates aggregate javadoc for all the artifacts"

val sourceSets = allprojects
.filter { it.name != "bom" }
.mapNotNull { it.extensions.findByType<SourceSetContainer>() }
.map { it.named("main") }

Expand All @@ -154,6 +155,7 @@ val javadocAggregateIncludingTests by tasks.registering(Javadoc::class) {
description = "Generates aggregate javadoc for all the artifacts, including test code"

val sourceSets = allprojects
.filter { it.name != "bom" }
.mapNotNull { it.extensions.findByType<SourceSetContainer>() }
.flatMap { listOf(it.named("main"), it.named("test")) }

Expand Down

0 comments on commit be8b99a

Please sign in to comment.