Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
25 changes: 14 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ concurrency:

permissions:
contents: read
pull-requests: read

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we revert this now?


env:
DOCKER_VOLUME_PREFIX: ".docker/"
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
uses: actions/cache@v5
with:
path: .docker
key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', '**/pom.xml', '**/*.java') }}
key: maven-${{ matrix.jdk }}-${{ matrix.maven }}-${{ hashFiles('compose.yaml', '**/pom.xml') }}
Comment thread
xborder marked this conversation as resolved.
restore-keys: maven-${{ matrix.jdk }}-${{ matrix.maven }}-
- name: Execute Docker Build
env:
Expand Down Expand Up @@ -94,16 +95,17 @@ jobs:
jdk: 17
macos: latest
steps:
- name: Set up Java
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ matrix.jdk }}
- name: Checkout Arrow
uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: recursive
- name: Set up Java
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ matrix.jdk }}
cache: 'maven'
- name: Build
shell: bash
env:
Expand All @@ -125,16 +127,17 @@ jobs:
matrix:
jdk: [17]
steps:
- name: Set up Java
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
- name: Checkout Arrow
uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: recursive
- name: Set up Java
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
cache: 'maven'
- name: Build
shell: bash
env:
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
Loading