[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 <gurwls223@apache.org> Signed-off-by: HyukjinKwon <gurwls223@apache.org>
This commit is contained in:
parent
9996e252ad
commit
b205be5ff6
16
.github/workflows/build_and_test.yml
vendored
16
.github/workflows/build_and_test.yml
vendored
|
@ -168,12 +168,10 @@ jobs:
|
||||||
python3.8 -m pip list
|
python3.8 -m pip list
|
||||||
# SparkR
|
# SparkR
|
||||||
- name: Install R 4.0
|
- name: Install R 4.0
|
||||||
|
uses: r-lib/actions/setup-r@v1
|
||||||
if: contains(matrix.modules, 'sparkr')
|
if: contains(matrix.modules, 'sparkr')
|
||||||
run: |
|
with:
|
||||||
sudo sh -c "echo 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/' >> /etc/apt/sources.list"
|
r-version: 4.0
|
||||||
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
|
|
||||||
- name: Install R packages
|
- name: Install R packages
|
||||||
if: contains(matrix.modules, 'sparkr')
|
if: contains(matrix.modules, 'sparkr')
|
||||||
run: |
|
run: |
|
||||||
|
@ -232,11 +230,9 @@ jobs:
|
||||||
# See also https://github.com/sphinx-doc/sphinx/issues/7551.
|
# See also https://github.com/sphinx-doc/sphinx/issues/7551.
|
||||||
pip3 install flake8 'sphinx<3.1.0' numpy pydata_sphinx_theme ipython nbsphinx
|
pip3 install flake8 'sphinx<3.1.0' numpy pydata_sphinx_theme ipython nbsphinx
|
||||||
- name: Install R 4.0
|
- name: Install R 4.0
|
||||||
run: |
|
uses: r-lib/actions/setup-r@v1
|
||||||
sudo sh -c "echo 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/' >> /etc/apt/sources.list"
|
with:
|
||||||
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE298A3A825C0D65DFD57CBB651716619E084DAB9" | sudo apt-key add
|
r-version: 4.0
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y r-base r-base-dev libcurl4-openssl-dev
|
|
||||||
- name: Install R linter dependencies and SparkR
|
- name: Install R linter dependencies and SparkR
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install -y libcurl4-openssl-dev
|
sudo apt-get install -y libcurl4-openssl-dev
|
||||||
|
|
Loading…
Reference in a new issue