Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,12 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
- name: Build
- name: Build and Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
ARROW_JAVA_BUILD_SKIP_TESTS: "OFF"
run: ci/scripts/build.sh . build jni
- name: Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ci/scripts/test.sh . build jni

windows:
name: AMD64 Windows Server 2022 Java JDK ${{ matrix.jdk }}
Expand All @@ -135,16 +131,12 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
- name: Build
- name: Build and Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
ARROW_JAVA_BUILD_SKIP_TESTS: "OFF"
run: ci/scripts/build.sh . build jni
- name: Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
run: ci/scripts/test.sh . build jni

integration:
name: AMD64 integration
Expand Down
10 changes: 8 additions & 2 deletions ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@ if [[ "${ARROW_JAVA_BUILD:-ON}" != "ON" ]]; then
exit
fi

source_dir=${1}
source_dir="$(cd "${1}" && pwd)"
build_dir=${2}
java_jni_dist_dir=${3}

mvn="mvn -B -DskipTests -Drat.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
mvn="mvn -B -Drat.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"

if [ "${ARROW_JAVA_BUILD_SKIP_TESTS:-ON}" = "ON" ]; then
mvn="${mvn} -DskipTests"
else
mvn="${mvn} -Darrow.test.dataRoot=${source_dir}/testing/data"
fi

if [ "${ARROW_JAVA_SKIP_GIT_PLUGIN:-OFF}" = "ON" ]; then
mvn="${mvn} -Dmaven.gitcommitid.skip=true"
Expand Down
6 changes: 3 additions & 3 deletions ci/scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mvn="${mvn} -T 2C"

pushd "${build_dir}"

${mvn} -Darrow.test.dataRoot="${source_dir}/testing/data" clean test
${mvn} -Darrow.test.dataRoot="${source_dir}/testing/data" test

projects=()
if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
Expand All @@ -46,7 +46,7 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then
projects+=(gandiva)
fi
if [ "${#projects[@]}" -gt 0 ]; then
${mvn} clean test \
${mvn} test \
-Parrow-jni \
-pl "$(
IFS=,
Expand All @@ -56,7 +56,7 @@ if [ "${#projects[@]}" -gt 0 ]; then
fi

if [ "${ARROW_JAVA_CDATA}" = "ON" ]; then
${mvn} clean test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir="${java_jni_dist_dir}"
${mvn} test -Parrow-c-data -pl c -Darrow.c.jni.dist.dir="${java_jni_dist_dir}"
fi

popd
6 changes: 2 additions & 4 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ services:
- ${DOCKER_VOLUME_PREFIX}maven-cache:/root/.m2:delegated
command:
/bin/bash -c "
/arrow-java/ci/scripts/build.sh /arrow-java /build /jni &&
/arrow-java/ci/scripts/test.sh /arrow-java /build /jni"
ARROW_JAVA_BUILD_SKIP_TESTS=OFF /arrow-java/ci/scripts/build.sh /arrow-java /build /jni"

conda-jni-cdata:
# Builds and tests just the C Data Interface JNI library and JARs.
Expand Down Expand Up @@ -81,8 +80,7 @@ services:
command:
/bin/bash -c "
/arrow-java/ci/scripts/jni_build.sh /arrow-java /build/jni /build /jni &&
/arrow-java/ci/scripts/build.sh /arrow-java /build /jni &&
/arrow-java/ci/scripts/test.sh /arrow-java /build /jni"
ARROW_JAVA_BUILD_SKIP_TESTS=OFF /arrow-java/ci/scripts/build.sh /arrow-java /build /jni"

vcpkg-jni:
# Builds all the JNI libraries, but not the JARs.
Expand Down
Loading