Skip to content

Commit

Permalink
apacheGH-39624: [R][CI] Add CMake to docker file and update envvars (a…
Browse files Browse the repository at this point in the history
…pache#39625)

### Rationale for this change

CMake is now a sysreq and we don't want to default to using nightly builds in CI

### Are these changes tested?

Crossbos
* Closes: apache#39624

Authored-by: Jacob Wujciak-Jens <jacob@wujciak.de>
Signed-off-by: Jacob Wujciak-Jens <jacob@wujciak.de>
  • Loading branch information
assignUser authored and idailylife committed Jan 18, 2024
1 parent 2f089fe commit 1a886e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions ci/scripts/r_docker_configure.sh
Expand Up @@ -91,8 +91,9 @@ if [ -f "${ARROW_SOURCE_HOME}/ci/scripts/r_install_system_dependencies.sh" ]; th
"${ARROW_SOURCE_HOME}/ci/scripts/r_install_system_dependencies.sh"
fi

# Install rsync for bundling cpp source and curl to make sure it is installed on all images
$PACKAGE_MANAGER install -y rsync curl
# Install rsync for bundling cpp source and curl to make sure it is installed on all images,
# cmake is now a listed sys req.
$PACKAGE_MANAGER install -y rsync cmake curl

# Workaround for html help install failure; see https://github.com/r-lib/devtools/issues/2084#issuecomment-530912786
Rscript -e 'x <- file.path(R.home("doc"), "html"); if (!file.exists(x)) {dir.create(x, recursive=TRUE); file.copy(system.file("html/R.css", package="stats"), x)}'
3 changes: 2 additions & 1 deletion docker-compose.yml
Expand Up @@ -1414,6 +1414,7 @@ services:
ARROW_DEPENDENCY_SOURCE: ''
ARROW_SOURCE_HOME: '/arrow'
FORCE_BUNDLED_BUILD: 'true'
LIBARROW_BINARY: 'false'
LIBARROW_BUILD: 'true'
extends: ubuntu-r
command: >
Expand Down Expand Up @@ -1443,7 +1444,7 @@ services:
shm_size: *shm-size
environment:
<<: [*common, *sccache]
LIBARROW_DOWNLOAD: "false"
LIBARROW_BINARY: "false"
ARROW_SOURCE_HOME: "/arrow"
ARROW_R_DEV: ${ARROW_R_DEV}
# To test for CRAN release, delete ^^ these two env vars so we download the Apache release
Expand Down

0 comments on commit 1a886e0

Please sign in to comment.