Skip to content

Commit 4feb9bd

Browse files
authored
apacheGH-49593: [R][CI] Add libuv-dev to CI jobs due to update to fs package (apache#49594)
### Rationale for this change fs package release no longer installs bundled libuv so we need to add it to our CI ### What changes are included in this PR? Add libuv to R install scripts on CI ### Are these changes tested? I'll run CI ### Are there any user-facing changes? No * GitHub Issue: apache#49593 Authored-by: Nic Crane <thisisnic@gmail.com> Signed-off-by: Nic Crane <thisisnic@gmail.com>
1 parent 1fb0e25 commit 4feb9bd

File tree

8 files changed

+11
-25
lines changed

8 files changed

+11
-25
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ R_ORG=rhub
8484
R_TAG=latest
8585

8686
# Env vars for R builds
87-
R_UPDATE_CLANG=false
8887
R_CUSTOM_CCACHE=false
8988
ARROW_R_DEV=TRUE
9089
R_PRUNE_DEPS=FALSE

ci/docker/linux-r.dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ ENV R_PRUNE_DEPS=${r_prune_deps}
3333
ARG r_custom_ccache=false
3434
ENV R_CUSTOM_CCACHE=${r_custom_ccache}
3535

36-
ARG r_update_clang=false
37-
ENV R_UPDATE_CLANG=${r_update_clang}
38-
3936
ARG tz="UTC"
4037
ENV TZ=${tz}
4138

ci/scripts/r_docker_configure.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,6 @@ else
8585
$PACKAGE_MANAGER install -y rsync cmake curl
8686
fi
8787

88-
# Update clang version to latest available.
89-
# This is only for rhub/clang20. If we change the base image from rhub/clang20,
90-
# we need to update this part too.
91-
if [ "$R_UPDATE_CLANG" = true ]; then
92-
apt update -y --allow-releaseinfo-change # flag needed for when debian version changes
93-
apt install -y gnupg
94-
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg
95-
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm20.list
96-
apt update -y --allow-releaseinfo-change # flag needed for when debian version changes
97-
apt install -y clang-20 lld-20
98-
fi
9988

10089
# Workaround for html help install failure; see https://github.com/r-lib/devtools/issues/2084#issuecomment-530912786
10190
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)}'

ci/scripts/r_install_system_dependencies.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,19 @@ else
3535
apt-get update
3636
fi
3737

38-
# Install curl and OpenSSL (technically, only needed for S3/GCS support, but
39-
# installing the R curl package fails without it)
38+
# Install curl, OpenSSL, and libuv
39+
# - curl/OpenSSL: technically only needed for S3/GCS support, but
40+
# installing the R curl package fails without it
41+
# - libuv: required by the fs R package (no longer bundles libuv by default)
4042
case "$PACKAGE_MANAGER" in
4143
apt-get)
42-
apt-get install -y libcurl4-openssl-dev libssl-dev
44+
apt-get install -y libcurl4-openssl-dev libssl-dev libuv1-dev
4345
;;
4446
apk)
45-
$PACKAGE_MANAGER add curl-dev openssl-dev
47+
$PACKAGE_MANAGER add curl-dev openssl-dev libuv-dev
4648
;;
4749
*)
48-
$PACKAGE_MANAGER install -y libcurl-devel openssl-devel
50+
$PACKAGE_MANAGER install -y libcurl-devel openssl-devel libuv-devel
4951
;;
5052
esac
5153

ci/scripts/r_revdepcheck.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ apt install -y \
3636
libbz2-dev \
3737
libc-ares-dev \
3838
libcurl4-openssl-dev \
39+
libuv1-dev \
3940
libgflags-dev \
4041
libgoogle-glog-dev \
4142
liblz4-dev \

compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,6 @@ services:
16671667
tz: ${TZ}
16681668
r_prune_deps: ${R_PRUNE_DEPS}
16691669
r_custom_ccache: ${R_CUSTOM_CCACHE}
1670-
r_update_clang: ${R_UPDATE_CLANG}
16711670
shm_size: *shm-size
16721671
environment:
16731672
<<: [*common, *sccache]

dev/tasks/r/github.linux.cran.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@ jobs:
3333
- { r_image: "ubuntu-clang" } # ~ r-devel-linux-x86_64-debian-clang
3434
- { r_image: "ubuntu-next" } # ~ r-patched-linux-x86_64
3535
- { r_image: "ubuntu-release" } # ~ r-release-linux-x86_64
36-
- { r_image: "clang20", skip_vignettes: true, r_update_clang: true } # ~ r-devel-linux-x86_64-fedora-clang
36+
- { r_image: "clang22", skip_vignettes: true } # ~ r-devel-linux-x86_64-fedora-clang
3737
env:
3838
R_ORG: "rhub"
3939
R_IMAGE: {{ '${{ matrix.config.r_image }}' }}
4040
R_TAG: "latest"
4141
ARROW_R_DEV: "FALSE"
42-
R_UPDATE_CLANG: {{ '${{ matrix.config.r_update_clang }}' }}
4342
steps:
4443
{{ macros.github_checkout_arrow()|indent }}
4544
{{ macros.github_install_archery()|indent }}

dev/tasks/r/github.packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,10 @@ jobs:
374374
arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
375375
- name: Install R package system dependencies (Linux)
376376
if: matrix.platform.name == 'Linux'
377-
run: sudo apt-get install -y libcurl4-openssl-dev libssl-dev
377+
run: sudo apt-get install -y libcurl4-openssl-dev libssl-dev libuv1-dev
378378
- name: Install R package system dependencies (macOS)
379379
if: matrix.platform.name == 'macOS'
380-
run: brew install sccache openssl curl
380+
run: brew install sccache openssl curl libuv
381381
- name: Remove arrow/
382382
run: |
383383
rm -rf arrow/

0 commit comments

Comments
 (0)