Skip to content

Commit 854f1f2

Browse files
authored
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]>
1 parent 11d64b5 commit 854f1f2

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ jobs:
207207
with:
208208
fetch-depth: 0
209209
submodules: recursive
210+
- name: Free up disk space
211+
run: |
212+
ci/scripts/util_free_space.sh
210213
- name: Cache Docker Volumes
211214
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
212215
with:

ci/docker/cpp-jni.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ FROM ${base}
2121
ARG arch
2222
ARG arch_short
2323

24-
SHELL ["/bin/bash", "-i", "-c"]
25-
ENTRYPOINT ["/bin/bash", "-i", "-c"]
26-
2724
# Install basic dependencies
2825
RUN dnf install -y \
2926
autoconf \
@@ -108,4 +105,5 @@ RUN --mount=type=secret,id=github_repository_owner \
108105

109106
ENV ARROW_BUILD_TESTS=ON \
110107
ARROW_CMAKE_ARGS="-DARROW_BUILD_TESTS=ON" \
111-
CMAKE_PRESET=ninja-${CMAKE_BUILD_TYPE}-jni-linux
108+
CMAKE_PRESET=ninja-${CMAKE_BUILD_TYPE}-jni-linux \
109+
VCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}

0 commit comments

Comments
 (0)