Skip to content

GH-50298: [CI][R] Update ubuntu-clang CI job to use clang 22 to match CRAN #50299

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

Open
thisisnic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-50298: [CI][R] Update ubuntu-clang CI job to use clang 22 to match CRAN #50299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/docker/linux-r.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ENV R_PRUNE_DEPS=${r_prune_deps}
ARG r_custom_ccache=false
ENV R_CUSTOM_CCACHE=${r_custom_ccache}

ARG r_update_clang=false
ENV R_UPDATE_CLANG=${r_update_clang}

ARG tz="UTC"
ENV TZ=${tz}

Expand Down
12 changes: 12 additions & 0 deletions ci/scripts/r_docker_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,17 @@ else
fi


# Update clang version to latest available.
# The rhub/ubuntu-clang image ships clang-15 but CRAN's debian-clang now uses
# clang 22. Install clang-22 from LLVM's apt repos to match.
if [ "$R_UPDATE_CLANG" = true ]; then
apt-get update -y --allow-releaseinfo-change
apt-get install -y gnupg
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-22 main" > /etc/apt/sources.list.d/llvm22.list
apt-get update -y --allow-releaseinfo-change
apt-get install -y clang-22 lld-22
fi
Comment on lines +92 to +99

# 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)}'
1 change: 1 addition & 0 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,6 +1684,7 @@ services:
tz: ${TZ}
r_prune_deps: ${R_PRUNE_DEPS}
r_custom_ccache: ${R_CUSTOM_CCACHE}
r_update_clang: ${R_UPDATE_CLANG}
shm_size: *shm-size
environment:
<<: [*common, *sccache]
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/r/github.linux.cran.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
config:
# See https://r-hub.github.io/containers/
- { r_image: "ubuntu-gcc12" } # ~ r-devel-linux-x86_64-debian-gcc
- { r_image: "ubuntu-clang" } # ~ r-devel-linux-x86_64-debian-clang
- { r_image: "ubuntu-clang", r_update_clang: true } # ~ r-devel-linux-x86_64-debian-clang
- { r_image: "ubuntu-next" } # ~ r-patched-linux-x86_64
- { r_image: "ubuntu-release" } # ~ r-release-linux-x86_64
- { r_image: "clang22", skip_vignettes: true } # ~ r-devel-linux-x86_64-fedora-clang
Expand All @@ -39,6 +39,7 @@ jobs:
R_IMAGE: {{ '${{ matrix.config.r_image }}' }}
R_TAG: "latest"
ARROW_R_DEV: "FALSE"
R_UPDATE_CLANG: {{ '${{ matrix.config.r_update_clang }}' }}
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_install_archery()|indent }}
Expand Down
Loading