Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-39624: [R][CI] Add CMake to docker file and update envvars #39625

Merged
merged 3 commits into from
Jan 16, 2024
Merged

GH-39624: [R][CI] Add CMake to docker file and update envvars #39625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6428c00
install cmake in r_docker_configure
assignUser Jan 16, 2024
8f7f9ab
prevent CI from using nightlies
assignUser Jan 16, 2024
2c97109
reinstate force bundled for now
assignUser Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ci/scripts/r_docker_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
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
assignUser marked this conversation as resolved.
Show resolved Hide resolved

# 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,7 @@ services:
ARROW_DEPENDENCY_SOURCE: ''
ARROW_SOURCE_HOME: '/arrow'
FORCE_BUNDLED_BUILD: 'true'
assignUser marked this conversation as resolved.
Show resolved Hide resolved
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