This is an automated email from the ASF dual-hosted git repository.
gurwls223 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 31684d6 [SPARK-33051][INFRA][R] Uses setup-r to install R in GitHub
Actions build
31684d6 is described below
commit 31684d671ca48cab771517796660676056ccc304
Author: HyukjinKwon <[email protected]>
AuthorDate: Fri Oct 2 15:12:33 2020 +0900
[SPARK-33051][INFRA][R] Uses setup-r to install R in GitHub Actions build
### What changes were proposed in this pull request?
At SPARK-32493, the R installation was switched to manual installation
because setup-r was broken. This seems fixed in the upstream so we should
better switch it back.
### Why are the changes needed?
To avoid maintaining the installation steps by ourselve.
### Does this PR introduce _any_ user-facing change?
No, dev-only.
### How was this patch tested?
GitHub Actions build in this PR should test it.
Closes #29931 from HyukjinKwon/recover-r-build.
Authored-by: HyukjinKwon <[email protected]>
Signed-off-by: HyukjinKwon <[email protected]>
(cherry picked from commit b205be5ff6926454b0afe76e4c3438cfa0f34832)
Signed-off-by: HyukjinKwon <[email protected]>
---
.github/workflows/build_and_test.yml | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build_and_test.yml
b/.github/workflows/build_and_test.yml
index b79fa16..acef583 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -161,12 +161,10 @@ jobs:
python3.8 -m pip list
# SparkR
- name: Install R 4.0
+ uses: r-lib/actions/setup-r@v1
if: contains(matrix.modules, 'sparkr')
- run: |
- sudo sh -c "echo 'deb https://cloud.r-project.org/bin/linux/ubuntu
bionic-cran40/' >> /etc/apt/sources.list"
- curl -sL
"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE298A3A825C0D65DFD57CBB651716619E084DAB9";
| sudo apt-key add
- sudo apt-get update
- sudo apt-get install -y r-base r-base-dev libcurl4-openssl-dev
+ with:
+ r-version: 4.0
- name: Install R packages
if: contains(matrix.modules, 'sparkr')
run: |
@@ -223,11 +221,9 @@ jobs:
run: |
pip3 install flake8 sphinx numpy
- name: Install R 4.0
- run: |
- sudo sh -c "echo 'deb https://cloud.r-project.org/bin/linux/ubuntu
bionic-cran40/' >> /etc/apt/sources.list"
- curl -sL
"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE298A3A825C0D65DFD57CBB651716619E084DAB9";
| sudo apt-key add
- sudo apt-get update
- sudo apt-get install -y r-base r-base-dev libcurl4-openssl-dev
+ uses: r-lib/actions/setup-r@v1
+ with:
+ r-version: 4.0
- name: Install R linter dependencies and SparkR
run: |
sudo apt-get install -y libcurl4-openssl-dev
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
