diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a9ae23fce0..fb932aac893 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,9 +69,7 @@ jobs: with: job-id: jdk${{ matrix.jdk }} remote-build-cache-proxy-enabled: false - # Arrow build is excluded because it is not supported on Windows - # See https://arrow.apache.org/docs/java/install.html#system-compatibility - arguments: --scan --no-parallel --no-daemon build javadoc --exclude-task :arrow:build + arguments: --scan --no-parallel --no-daemon build javadoc - name: 'sqlline and sqllsh' shell: cmd run: | @@ -105,9 +103,7 @@ jobs: with: job-id: jdk${{ matrix.jdk }} remote-build-cache-proxy-enabled: false - # Arrow build is excluded because it is not supported on Windows - # See https://arrow.apache.org/docs/java/install.html#system-compatibility - arguments: --scan --no-parallel --no-daemon build --exclude-task :arrow:build + arguments: --scan --no-parallel --no-daemon build - name: 'sqlline and sqllsh' shell: cmd run: | diff --git a/build.gradle.kts b/build.gradle.kts index 0f4ff553db4..d6fd061f688 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ import java.net.URI import net.ltgt.gradle.errorprone.errorprone import org.apache.calcite.buildtools.buildext.dsl.ParenthesisBalancer import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.gradle.internal.os.OperatingSystem plugins { // java-base is needed for platform(...) resolution, @@ -211,10 +212,13 @@ val javadocAggregateIncludingTests by tasks.registering(Javadoc::class) { setDestinationDir(file("$buildDir/docs/javadocAggregateIncludingTests")) } -val adaptersForSqlline = listOf( - ":arrow", ":babel", ":cassandra", ":druid", ":elasticsearch", +val adaptersForSqlline = mutableListOf( + ":babel", ":cassandra", ":druid", ":elasticsearch", ":file", ":geode", ":innodb", ":kafka", ":mongodb", ":pig", ":piglet", ":plus", ":redis", ":spark", ":splunk") +if (!OperatingSystem.current().isWindows) { + adaptersForSqlline.add(":arrow") +} val dataSetsForSqlline = listOf( "net.hydromatic:foodmart-data-hsqldb", diff --git a/settings.gradle.kts b/settings.gradle.kts index adb373f79b9..0a19aea9887 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,6 +15,7 @@ * limitations under the License. */ import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures +import org.gradle.internal.os.OperatingSystem pluginManagement { plugins { @@ -67,7 +68,6 @@ rootProject.name = "calcite" include( "bom", "release", - "arrow", "babel", "cassandra", "core", @@ -92,6 +92,12 @@ include( "ubenchmark" ) +// Arrow is excluded because it is not supported on Windows +// See https://arrow.apache.org/docs/java/install.html#system-compatibility +if (!OperatingSystem.current().isWindows) { + include(":arrow") +} + // See https://github.com/gradle/gradle/issues/1348#issuecomment-284758705 and // https://github.com/gradle/gradle/issues/5321#issuecomment-387561204 // Gradle inherits Ant "default excludes", however we do want to archive those files