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

GH-45605: [R][C++] Fix identifier ... preceded by whitespace warnings #45606

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+14 −11
Open

GH-45605: [R][C++] Fix identifier ... preceded by whitespace warnings #45606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c81bfb0
crossbow run
jonkeane Feb 23, 2025
27b318c
add a clang 20 job
jonkeane Feb 23, 2025
91b04d1
try without vignettes
jonkeane Feb 23, 2025
ba39cba
one more place
jonkeane Feb 23, 2025
1f5438d
so template; much annoy
jonkeane Feb 23, 2025
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
4 changes: 3 additions & 1 deletion ci/scripts/r_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ export TEXMFVAR=/tmp/texmf-var
BEFORE=$(ls -alh ~/)

SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
if (as_cran) {
# generally will be false, but we can override it by setting SKIP_VIGNETTES=true
skip_vignettes <- identical(tolower(Sys.getenv('SKIP_VIGNETTES')), 'true')
if (as_cran && !skip_vignettes) {
args <- '--as-cran'
build_args <- character()
} else {
Expand Down
21 changes: 11 additions & 10 deletions dev/tasks/r/github.linux.cran.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@

jobs:
as-cran:
name: "rhub/{{ MATRIX }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this?

arrow/dev/tasks/tasks.yml

Lines 1157 to 1158 in 12cdaaa

params:
MATRIX: {{ "${{ matrix.r_image }}" }}

name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# See https://hub.docker.com/r/rhub
r_image:
- ubuntu-gcc12 # ~ r-devel-linux-x86_64-debian-gcc
- ubuntu-clang # ~ r-devel-linux-x86_64-debian-clang
- ubuntu-next # ~ r-patched-linux-x86_64
- ubuntu-release # ~ r-release-linux-x86_64
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-next" } # ~ r-patched-linux-x86_64
- { r_image: "ubuntu-release" } # ~ r-release-linux-x86_64
- { r_image: "clang20", skip_vignettes: true } # ~ r-devel-linux-x86_64-fedora-clang
env:
R_ORG: "rhub"
R_IMAGE: {{ MATRIX }}
R_IMAGE: {{ '${{ matrix.config.r_image }}' }}
R_TAG: "latest"
ARROW_R_DEV: "FALSE"
steps:
Expand All @@ -46,7 +47,7 @@ jobs:
env:
{{ macros.github_set_sccache_envvars()|indent(8)}}
# setting ARROW_SOURCE_HOME='' here ensures that we use the cpp source copied into tools/
run: archery docker run -e ARROW_SOURCE_HOME='' r
run: archery docker run -e ARROW_SOURCE_HOME='' -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r
- name: Dump install logs
run: cat arrow/r/check/arrow.Rcheck/00install.out
if: always()
Expand All @@ -57,5 +58,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: test-output-{{ "${{ matrix.r_image }}" }}
name: test-output-{{ "${{ matrix.config.r_image }}" }}
path: arrow/r/check/arrow.Rcheck/tests/testthat.Rout*
Loading