From 9738c8d5775a1971979d7dca57247cb8dbcc211d Mon Sep 17 00:00:00 2001 From: Richard Antal Date: Fri, 30 Jun 2023 12:05:03 +0200 Subject: [PATCH] [CALCITE-5812] Fix failing ./gradlew tasks Exclude "bom" project from the javadoc aggregation since it does not have "main" and "test" objects causing "tasks" to fail. Change-Id: I934ad2b75bf0c109bc85adc0dcb7e4208666605b --- .github/workflows/main.yml | 6 +++--- build.gradle.kts | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a2670a8d63..c55c92b695 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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' @@ -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' @@ -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 diff --git a/build.gradle.kts b/build.gradle.kts index d5671dab97..374a2a980b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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() } .map { it.named("main") } @@ -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() } .flatMap { listOf(it.named("main"), it.named("test")) }