This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 7cd1aab [SPARK-33757][INFRA][R][FOLLOWUP] Provide more simple solution
7cd1aab is described below
commit 7cd1aab11953b676ac8d4f6084f4a77396bca89d
Author: Kousuke Saruta <[email protected]>
AuthorDate: Sun Dec 13 17:27:39 2020 -0800
[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 <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit b135db3b1a5c0b2170e98b97f6160bcf55903799)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.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 6020fe4..d80b132 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -321,10 +321,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/[email protected]')"
./R/install-dev.sh
diff --git a/appveyor.yml b/appveyor.yml
index 1941b77..e0d2396 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: R -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071',
'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')"
- cmd: R -e "packageVersion('knitr'); packageVersion('rmarkdown');
packageVersion('testthat'); packageVersion('e1071');
packageVersion('survival'); packageVersion('arrow')"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
