Skip to content

Commit 9920ec1

Browse files
committed
Try clang 14 on ubuntu
1 parent c208f73 commit 9920ec1

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

ci/docker/linux-r.dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ ENV R_CUSTOM_CCACHE=${r_custom_ccache}
3636
ARG r_update_clang=false
3737
ENV R_UPDATE_CLANG=${r_update_clang}
3838

39+
ARG r_old_clang=false
40+
ENV R_OLD_CLANG=${r_old_clang}
41+
3942
ARG tz="UTC"
4043
ENV TZ=${tz}
4144

ci/scripts/r_docker_configure.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,13 @@ if [ "$R_UPDATE_CLANG" = true ]; then
9797
apt install -y clang-20 lld-20
9898
fi
9999

100+
# Use an old clang version to simulate CRAN's macos clang-14 environment.
101+
# This is only for rhub/clang20. If we change the base image from rhub/clang20,
102+
# we need to update this part too.
103+
if [ "$R_OLD_CLANG" = true ]; then
104+
apt update -y --allow-releaseinfo-change # flag needed for when debian version changes
105+
apt install -y clang-14 lld-14
106+
fi
107+
100108
# Workaround for html help install failure; see https://github.com/r-lib/devtools/issues/2084#issuecomment-530912786
101109
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)}'

compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,6 +1667,7 @@ services:
16671667
r_prune_deps: ${R_PRUNE_DEPS}
16681668
r_custom_ccache: ${R_CUSTOM_CCACHE}
16691669
r_update_clang: ${R_UPDATE_CLANG}
1670+
r_old_clang: ${R_OLD_CLANG}
16701671
shm_size: *shm-size
16711672
environment:
16721673
<<: [*common, *sccache]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ jobs:
3434
- { r_image: "ubuntu-next" } # ~ r-patched-linux-x86_64
3535
- { r_image: "ubuntu-release" } # ~ r-release-linux-x86_64
3636
- { r_image: "clang20", skip_vignettes: true, r_update_clang: true } # ~ r-devel-linux-x86_64-fedora-clang
37+
- { r_image: "clang20", skip_vignettes: true, r_old_clang: true } # ~ r-devel-linux-x86_64-fedora-clang
3738
env:
3839
R_ORG: "rhub"
3940
R_IMAGE: {{ '${{ matrix.config.r_image }}' }}
4041
R_TAG: "latest"
4142
ARROW_R_DEV: "FALSE"
4243
R_UPDATE_CLANG: {{ '${{ matrix.config.r_update_clang }}' }}
44+
R_OLD_CLANG: {{ '${{ matrix.config.r_old_clang }}' }}
4345
steps:
4446
{{ macros.github_checkout_arrow()|indent }}
4547
{{ macros.github_install_archery()|indent }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
jobs:
2323
macos-cran:
2424
name: "macOS similar to CRAN"
25-
runs-on: macOS-14
25+
runs-on: macOS-latest
2626
strategy:
2727
fail-fast: false
2828

@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Configure dependencies (macos)
3333
run: |
34-
brew install openssl llvm@14
34+
brew install openssl
3535
# disable sccache on macos as it times out for unknown reasons
3636
# see GH-33721
3737
# brew install sccache
@@ -61,7 +61,7 @@ jobs:
6161
- name: Install
6262
env:
6363
_R_CHECK_CRAN_INCOMING_: false
64-
CXX: "clang++-14 -mmacos-version-min=14.6"
64+
CXX: "clang++ -mmacos-version-min=14.6"
6565
CFLAGS: "-falign-functions=8 -g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion -Wstrict-prototypes"
6666
CXXFLAGS: "-g -O2 -Wall -pedantic -Wconversion -Wno-sign-conversion"
6767
NOT_CRAN: false

0 commit comments

Comments
 (0)