This is an automated email from the ASF dual-hosted git repository.
raulcd pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 854f1f2ace GH-47970: [CI][C++] Fix a bug that JNI jobs runs nothing
(#47972)
854f1f2ace is described below
commit 854f1f2aceaf4a46e0d641e526634f399a93ec00
Author: Sutou Kouhei <[email protected]>
AuthorDate: Tue Nov 25 21:17:18 2025 +0900
GH-47970: [CI][C++] Fix a bug that JNI jobs runs nothing (#47972)
### Rationale for this change
If we use `bash -i -c` as `ENTRYPOINT`, we need to pass command line as a
string such as `archery docker run cpp-jni 'ls -la'` not `archery docker run
cpp-jni ls -lah`.
Our `compose.yaml` assumes the latter style. So our command line in
`compose.yaml` is ignored.
### What changes are included in this PR?
Remove needless `SHELL` and `ENTRYPOINT`.
### Are these changes tested?
Yes.
### Are there any user-facing changes?
No.
* GitHub Issue: #47970
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Raúl Cumplido <[email protected]>
---
.github/workflows/cpp_extra.yml | 3 +++
ci/docker/cpp-jni.dockerfile | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/cpp_extra.yml b/.github/workflows/cpp_extra.yml
index edd9d4414f..57b419f31c 100644
--- a/.github/workflows/cpp_extra.yml
+++ b/.github/workflows/cpp_extra.yml
@@ -207,6 +207,9 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
+ - name: Free up disk space
+ run: |
+ ci/scripts/util_free_space.sh
- name: Cache Docker Volumes
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
diff --git a/ci/docker/cpp-jni.dockerfile b/ci/docker/cpp-jni.dockerfile
index b21ec762d6..f268de12ca 100644
--- a/ci/docker/cpp-jni.dockerfile
+++ b/ci/docker/cpp-jni.dockerfile
@@ -21,9 +21,6 @@ FROM ${base}
ARG arch
ARG arch_short
-SHELL ["/bin/bash", "-i", "-c"]
-ENTRYPOINT ["/bin/bash", "-i", "-c"]
-
# Install basic dependencies
RUN dnf install -y \
autoconf \
@@ -108,4 +105,5 @@ RUN --mount=type=secret,id=github_repository_owner \
ENV ARROW_BUILD_TESTS=ON \
ARROW_CMAKE_ARGS="-DARROW_BUILD_TESTS=ON" \
- CMAKE_PRESET=ninja-${CMAKE_BUILD_TYPE}-jni-linux
+ CMAKE_PRESET=ninja-${CMAKE_BUILD_TYPE}-jni-linux \
+ VCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}
