Skip to content

Commit

Permalink
[CALCITE-6390] Exclude Arrow project on Windows builds
Browse files Browse the repository at this point in the history
  • Loading branch information
zabetak committed Apr 29, 2024
1 parent 3e633f6 commit 604ce5c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
8 changes: 6 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 7 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* limitations under the License.
*/
import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
import org.gradle.internal.os.OperatingSystem

pluginManagement {
plugins {
Expand Down Expand Up @@ -67,7 +68,6 @@ rootProject.name = "calcite"
include(
"bom",
"release",
"arrow",
"babel",
"cassandra",
"core",
Expand All @@ -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
Expand Down

0 comments on commit 604ce5c

Please sign in to comment.