From f6795e1d8b491b7a64c24f0bad0f490c2f3507d8 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 11 Oct 2023 16:17:53 -0300 Subject: [PATCH 1/5] update actions that used outdated v1 setup-r --- dev/tasks/r/github.devdocs.yml | 27 +++------------------------ dev/tasks/r/github.linux.rchk.yml | 15 +++++++++------ dev/tasks/tasks.yml | 4 ---- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/dev/tasks/r/github.devdocs.yml b/dev/tasks/r/github.devdocs.yml index 0839e7fc6afcf..92e94c6c97637 100644 --- a/dev/tasks/r/github.devdocs.yml +++ b/dev/tasks/r/github.devdocs.yml @@ -26,17 +26,11 @@ jobs: strategy: fail-fast: false matrix: - os: [macOS-latest, ubuntu-20.04, windows-latest] + os: [macOS-latest, ubuntu-20.04] steps: {{ macros.github_checkout_arrow()|indent }} - # TODO (ARROW-16376): Switch to v2 once we use UCRT - - uses: r-lib/actions/setup-r@v1 - with: - # temp workaround the fact that R 4.2 requires UCRT which isn't - # currently part of this build. - # remove after https://issues.apache.org/jira/browse/ARROW-16376 - r-version: '4.1' + - uses: r-lib/actions/setup-r@v2 - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r-dependencies@v2 with: @@ -47,15 +41,11 @@ jobs: pkgs <- installed.packages()[, "Package"] sessioninfo::session_info(pkgs, include_base = TRUE) shell: Rscript {0} - - name: Remove system gfortran so that brew can install gcc successfully - run: rm -f /usr/local/bin/gfortran - if: {{ "${{ !contains(matrix.os, 'windows') }}" }} - name: Write the install script env: RUN_DEVDOCS: TRUE DEVDOCS_MACOS: {{ "${{contains(matrix.os, 'macOS')}}" }} DEVDOCS_UBUNTU: {{ "${{contains(matrix.os, 'ubuntu')}}" }} - DEVDOCS_WINDOWS: {{ "${{contains(matrix.os, 'windows')}}" }} run: | # This isn't actually rendering the docs, but will save arrow/r/vignettes/developers/script.sh # which can be sourced to install arrow. @@ -65,21 +55,10 @@ jobs: env: LIBARROW_BINARY: FALSE ARROW_R_DEV: TRUE - DEVDOCS_WINDOWS: {{ "${{contains(matrix.os, 'windows')}}" }} run: | - if [ $DEVDOCS_WINDOWS == "true" ]; then - # Part of Path, including the path to R's bin, needs to be reformatted - # from Windows paths (C:\R\bin) to Unix paths (/c/r/bin) - echo export PATH=\"$(cygpath --path "$PATH")\" >> ~/.bash_profile - # This starts a special mingw64 Git Bash shell - $RTOOLS40_HOME/msys2_shell.cmd -here -mingw64 -no-start -defterm -full-path arrow/r/vignettes/developers/script.sh - else - bash arrow/r/vignettes/developers/script.sh - fi + bash arrow/r/vignettes/developers/script.sh shell: bash - name: Ensure that the Arrow package is loadable and we have the correct one - env: - DEVDOCS_WINDOWS: {{ "${{contains(matrix.os, 'windows')}}" }} run: | echo $LD_LIBRARY_PATH R --no-save < Date: Wed, 11 Oct 2023 16:25:35 -0300 Subject: [PATCH 2/5] maybe fix ref --- dev/tasks/r/github.linux.rchk.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/tasks/r/github.linux.rchk.yml b/dev/tasks/r/github.linux.rchk.yml index d39979a882aa5..f605289731857 100644 --- a/dev/tasks/r/github.linux.rchk.yml +++ b/dev/tasks/r/github.linux.rchk.yml @@ -34,8 +34,6 @@ jobs: - uses: r-lib/actions/setup-r@v2 - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r-dependencies@v2 - env: - GITHUB_PAT: "${{ github.token }}" with: working-directory: 'r' extra-packages: | From e0c3e30490a545736c943717332b735890362bb6 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 11 Oct 2023 16:51:45 -0300 Subject: [PATCH 3/5] re-add devdocs --- dev/tasks/tasks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index f79335543ed84..0950378875645 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1344,6 +1344,10 @@ tasks: env: CMAKE_BUILD_TYPE: MinSizeRel + test-r-devdocs: + ci: github + template: r/github.devdocs.yml + test-r-depsource-bundled: ci: azure template: r/azure.linux.yml From 7522af719df0d2a02072ecb5e8fc6871fac3c920 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 11 Oct 2023 17:01:25 -0300 Subject: [PATCH 4/5] maybe fix workflow file --- dev/tasks/r/github.linux.rchk.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tasks/r/github.linux.rchk.yml b/dev/tasks/r/github.linux.rchk.yml index f605289731857..4f565600ffcfb 100644 --- a/dev/tasks/r/github.linux.rchk.yml +++ b/dev/tasks/r/github.linux.rchk.yml @@ -38,7 +38,6 @@ jobs: working-directory: 'r' extra-packages: | any::rcmdcheck - shell: Rscript {0} - name: Build arrow package run: | R CMD build --no-build-vignettes arrow/r From c98384fe2ae1b553edd02fb150ae34c9c09339a8 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 11 Oct 2023 21:02:12 -0300 Subject: [PATCH 5/5] maybe the right subdir --- dev/tasks/r/github.linux.rchk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/r/github.linux.rchk.yml b/dev/tasks/r/github.linux.rchk.yml index 4f565600ffcfb..a673304ff238d 100644 --- a/dev/tasks/r/github.linux.rchk.yml +++ b/dev/tasks/r/github.linux.rchk.yml @@ -35,7 +35,7 @@ jobs: - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r-dependencies@v2 with: - working-directory: 'r' + working-directory: 'arrow/r' extra-packages: | any::rcmdcheck - name: Build arrow package