feedback

Author: lidavidm

.github/workflows/test.yml

@@ -38,7 +38,7 @@ env:
 
 jobs:
   ubuntu:
-    name: ${{ matrix.name }} AMD64 Ubuntu 22.04 JDK ${{ matrix.jdk }} Maven ${{ matrix.maven }}
+    name: ${{ matrix.name }} AMD64 Ubuntu JDK ${{ matrix.jdk }} Maven ${{ matrix.maven }}
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 30
@@ -47,11 +47,11 @@ jobs:
       matrix:
         jdk: [11, 17, 21, 22]
         maven: [3.9.9]
-        image: [java, conda-java-jni-cdata]
+        image: [java, conda-jni-cdata]
         include:
           - image: java
             name: ""
-          - image: conda-java-jni-cdata
+          - image: conda-jni-cdata
             name: JNI
     env:
       JDK: ${{ matrix.jdk }}

ci/docker/conda-java-jni.dockerfile ci/docker/conda-jni.dockerfileci/docker/conda-java-jni.dockerfile renamed to ci/docker/conda-jni.dockerfile

@@ -38,7 +38,7 @@ case "$(uname)" in
     n_jobs=$(nproc)
     ;;
   Darwin)
-    n_jobs=$(sysctl -n hw.ncpu)
+    n_jobs=$(sysctl -n hw.logicalcpu)
     ;;
   *)
     n_jobs=${NPROC:-1}

ci/scripts/java_jni_build.sh

@@ -46,17 +46,17 @@ services:
         /arrow-java/ci/scripts/java_build.sh /arrow-java /build &&
         /arrow-java/ci/scripts/java_test.sh /arrow-java /build"
 
-  conda-java-jni-cdata:
+  conda-jni-cdata:
     # Usage:
-    #   docker compose build java-jni-cdata
-    #   docker compose run java-jni-cdata
+    #   docker compose build conda-jni-cdata
+    #   docker compose run conda-jni-cdata
     # Parameters:
     #   MAVEN: 3.9.9
     #   JDK: 11, 17, 21
     image: ${REPO}:${ARCH}-conda-java-${JDK}-maven-${MAVEN}-jni-integration
     build:
       context: .
-      dockerfile: ci/docker/conda-java-jni.dockerfile
+      dockerfile: ci/docker/conda-jni.dockerfile
       cache_from:
         - ${REPO}:${ARCH}-conda-java-${JDK}-maven-${MAVEN}-jni-integration
       args: