From b135db3b1a5c0b2170e98b97f6160bcf55903799 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Sun, 13 Dec 2020 17:27:39 -0800 Subject: [PATCH] [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 #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 #30753 from sarutak/followup-SPARK-33757. Authored-by: Kousuke Saruta Signed-off-by: Dongjoon Hyun --- .github/workflows/build_and_test.yml | 5 +---- appveyor.yml | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 30199eaa41..f133a4132b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -335,10 +335,7 @@ jobs: r-version: 4.0 - name: Install R linter dependencies and SparkR run: | - sudo apt-get install -y libcurl4-openssl-dev - # dependencies for usethis 1.6.3. - 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/')" - sudo Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/usethis/usethis_1.6.3.tar.gz', repos=NULL, type='source')" + sudo apt-get install -y libcurl4-openssl-dev libgit2-dev libssl-dev libxml2-dev sudo Rscript -e "install.packages(c('devtools'), repos='https://cloud.r-project.org/')" sudo Rscript -e "devtools::install_github('jimhester/lintr@v2.0.0')" ./R/install-dev.sh diff --git a/appveyor.yml b/appveyor.yml index b6a42a02d1..c40b23c834 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,9 +41,6 @@ cache: install: # Install maven and dependencies - ps: .\dev\appveyor-install-dependencies.ps1 - # usethis and its dependencies - - 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/')" - - cmd: Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/usethis/usethis_1.6.3.tar.gz', repos=NULL, type='source')" # Required package for R unit tests. xml2 is required to use jUnit reporter in testthat. - cmd: Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')" - cmd: Rscript -e "pkg_list <- as.data.frame(installed.packages()[,c(1, 3:4)]); pkg_list[is.na(pkg_list$Priority), 1:2, drop = FALSE]"