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

Fixes GH-492.
apache · Jan 8, 2025 · f384126 · f384126
1 parent 33717d4
commit f384126
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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 }}
@@ -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

diff --git a/ci/scripts/java_build.sh → ci/scripts/build.sh b/ci/scripts/java_build.sh → ci/scripts/build.sh
diff --git a/ci/scripts/java_test.sh → ci/scripts/test.sh b/ci/scripts/java_test.sh → ci/scripts/test.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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.
@@ -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.