Some more fixing mainly for R binary jobs

apache · Dec 30, 2024 · 1dc7bec · 1dc7bec
1 parent 3e84a5c
commit 1dc7bec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -288,17 +288,6 @@ jobs:
           msystem: UCRT64
           update: true
           install: mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-aws-sdk-cpp
-      - name: Debug CI paths
-        shell: bash
-        run: |
-          echo "## /c/msys64"
-          ls /c/msys64
-          echo "## /c/msys64/usr/lib"
-          ls /c/msys64/usr/lib
-          echo "## /c/msys64/ucrt64"
-          ls /c/msys64/ucrt64
-          echo "## /c/msys64/ucrt64/lib"
-          ls /c/msys64/ucrt64/lib
       - uses: r-lib/actions/setup-r@v2
         with:
           # Note: RTools must be 40 here because RTools40 + ucrt is how we build the Arrow C++

diff --git a/ci/docker/centos-7-cpp.dockerfile b/ci/docker/centos-7-cpp.dockerfile
@@ -37,7 +37,6 @@ RUN \
     -e 's/mirror\.centos\.org/vault.centos.org/' \
     /etc/yum.repos.d/CentOS-SCLo-scl*.repo && \
   yum install -y \
-    cmake3 \
     curl \
     devtoolset-8 \
     diffutils \
@@ -49,6 +48,10 @@ RUN \
     wget \
     which
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
 RUN bash /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
 

diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -1359,7 +1359,6 @@ tasks:
     template: docker-tests/github.cuda.yml
     params:
       env:
-        CMAKE_VERSION: 3.25.0
         UBUNTU: 20.04
       image: ubuntu-cuda-cpp
 
@@ -1368,7 +1367,6 @@ tasks:
     template: docker-tests/github.cuda.yml
     params:
       env:
-        CMAKE_VERSION: 3.25.0
         CUDA: 11.7.1
         UBUNTU: 22.04
       image: ubuntu-cuda-cpp
@@ -1378,7 +1376,6 @@ tasks:
     template: docker-tests/github.cuda.yml
     params:
       env:
-        CMAKE_VERSION: 3.25.0
         CUDA: 11.7.1
         UBUNTU: 22.04
       image: ubuntu-cuda-python

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -426,6 +426,7 @@ services:
         arch: ${ARCH}
         base: "${ARCH}/ubuntu:${UBUNTU}"
         clang_tools: ${CLANG_TOOLS}
+        cmake: ${CMAKE_VERSION}
         llvm: ${LLVM}
         gcc_version: ${GCC_VERSION}
     shm_size: *shm-size
@@ -455,6 +456,8 @@ services:
       dockerfile: ci/docker/centos-7-cpp.dockerfile
       cache_from:
         - ${REPO}:centos-7-cpp-static
+      args:
+        cmake: ${CMAKE_VERSION}
     shm_size: *shm-size
     volumes:
       - .:/arrow:delegated