Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-492: [CI] Remove java_ prefix from ci/scripts/*.sh #493

Merged
merged 1 commit into from
Jan 8, 2025
Merged

GH-492: [CI] Remove java_ prefix from ci/scripts/*.sh #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ jobs:
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
run: ci/scripts/java_build.sh $(pwd) $(pwd)/build
run: ci/scripts/build.sh $(pwd) $(pwd)/build
- name: Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
run: ci/scripts/java_test.sh $(pwd) $(pwd)/build
run: ci/scripts/test.sh $(pwd) $(pwd)/build

windows:
name: AMD64 Windows Server 2022 Java JDK ${{ matrix.jdk }}
Expand All @@ -139,12 +139,12 @@ jobs:
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
run: ci/scripts/java_build.sh $(pwd) $(pwd)/build
run: ci/scripts/build.sh $(pwd) $(pwd)/build
- name: Test
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
run: ci/scripts/java_test.sh $(pwd) $(pwd)/build
run: ci/scripts/test.sh $(pwd) $(pwd)/build

integration:
name: AMD64 integration
Expand Down
0 ci/scripts/java_build.sh → ci/scripts/build.sh
View file
Open in desktop
File renamed without changes.
0 ci/scripts/java_test.sh → ci/scripts/test.sh
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ services:
- ${DOCKER_VOLUME_PREFIX}maven-cache:/root/.m2:delegated
command:
/bin/bash -c "
/arrow-java/ci/scripts/java_build.sh /arrow-java /build &&
/arrow-java/ci/scripts/java_test.sh /arrow-java /build"
/arrow-java/ci/scripts/build.sh /arrow-java /build &&
/arrow-java/ci/scripts/test.sh /arrow-java /build"

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

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