Skip to content

Commit 7cd1aab

Browse files
sarutakdongjoon-hyun
authored andcommitted
[SPARK-33757][INFRA][R][FOLLOWUP] Provide more simple solution
### What changes were proposed in this pull request? This PR proposes a better solution for the R build failure on GitHub Actions. The issue is solved in apache#30737 but I noticed the following two things. * We can use the latest `usethis` if we install additional libraries on the GitHub Actions environment. * For tests on AppVeyor, `usethis` is not necessary, so I partially revert the previous change. ### Why are the changes needed? For more simple solution. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Confirmed on GitHub Actions and AppVeyor on my account. Closes apache#30753 from sarutak/followup-SPARK-33757. Authored-by: Kousuke Saruta <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]> (cherry picked from commit b135db3) Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 14e77ab commit 7cd1aab

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,7 @@ jobs:
321321
r-version: 4.0
322322
- name: Install R linter dependencies and SparkR
323323
run: |
324-
sudo apt-get install -y libcurl4-openssl-dev
325-
# dependencies for usethis 1.6.3.
326-
sudo Rscript -e "install.packages(c('clipr', 'cli', 'crayon', 'desc', 'fs', 'gh', 'glue', 'purrr', 'rematch2', 'rlang', 'rprojroot', 'whisker', 'withr', 'yaml', 'git2r', 'rstudioapi'), repos='https://cloud.r-project.org/')"
327-
sudo Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/usethis/usethis_1.6.3.tar.gz', repos=NULL, type='source')"
324+
sudo apt-get install -y libcurl4-openssl-dev libgit2-dev libssl-dev libxml2-dev
328325
sudo Rscript -e "install.packages(c('devtools'), repos='https://cloud.r-project.org/')"
329326
sudo Rscript -e "devtools::install_github('jimhester/[email protected]')"
330327
./R/install-dev.sh

appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ cache:
4141
install:
4242
# Install maven and dependencies
4343
- ps: .\dev\appveyor-install-dependencies.ps1
44-
# usethis and its dependencies
45-
- cmd: Rscript -e "install.packages(c('clipr', 'cli', 'crayon', 'desc', 'fs', 'gh', 'glue', 'purrr', 'rematch2', 'rlang', 'rprojroot', 'whisker', 'withr', 'yaml', 'git2r', 'rstudioapi'), repos='https://cloud.r-project.org/')"
46-
- cmd: Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/usethis/usethis_1.6.3.tar.gz', repos=NULL, type='source')"
4744
# Required package for R unit tests. xml2 is required to use jUnit reporter in testthat.
4845
- cmd: R -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')"
4946
- cmd: R -e "packageVersion('knitr'); packageVersion('rmarkdown'); packageVersion('testthat'); packageVersion('e1071'); packageVersion('survival'); packageVersion('arrow')"

0 commit comments

Comments
 (0)