diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index c64822461f3e0..25430d19b4166 100644 --- 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 index 7b7e989adc0d1..da378eac43028 100644 --- 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 index c5894d75af434..ed9c838f31fa9 100644 --- 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]