Some more fixes for R

apache · Dec 10, 2024 · bcb5bd3 · bcb5bd3
1 parent 803518d
commit bcb5bd3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -290,6 +290,11 @@ jobs:
           r-version: "4.1"
           rtools-version: 40
           Ncpus: 2
+      - name: Install CMake 3.25.0
+        shell: bash
+        run: |
+          ci/scripts/install_cmake.sh 3.25.0 /c/cmake
+          echo "c:\\cmake\\bin" >> $GITHUB_PATH
       - name: Build Arrow C++
         shell: bash
         env:

diff --git a/ci/docker/linux-r.dockerfile b/ci/docker/linux-r.dockerfile
@@ -51,6 +51,10 @@ RUN /arrow/ci/scripts/r_docker_configure.sh
 COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
 
+ARG cmake
+COPY ci/scripts/install_cmake.sh /arrow/ci/scripts/
+RUN /arrow/ci/scripts/install_cmake.sh ${cmake} /usr/local/
+
 COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
 COPY r/DESCRIPTION /arrow/r/
 RUN /arrow/ci/scripts/r_deps.sh /arrow
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1571,6 +1571,7 @@ services:
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
         r_custom_ccache: ${R_CUSTOM_CCACHE}
+        cmake: ${CMAKE}
     shm_size: *shm-size
     environment:
       <<: [*common, *sccache]