From 88ce87d1464fb894cfb2fe2e03741d8a8869b392 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 27 Apr 2020 20:58:34 -0700
Subject: [PATCH 1/2] [SPARK-31589][INFRA] Use `r-lib/actions/setup-r` in
 GitHub Action

---
 .github/workflows/master.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 632a0f1aa91fd..5724ef2bf987e 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -103,12 +103,12 @@ jobs:
     - uses: actions/setup-java@v1
       with:
         java-version: '11'
-    - name: install R
+    - uses: r-lib/actions/setup-r@v1
+      with:
+        r-version: '3.6.2'
+    - name: Install lib and pandoc
       run: |
-        echo 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/' | sudo tee -a /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
+        sudo apt-get install -y libcurl4-openssl-dev pandoc
     - name: install R packages
       run: |
         sudo Rscript -e "install.packages(c('curl', 'xml2', 'httr', 'devtools', 'testthat', 'knitr', 'rmarkdown', 'roxygen2', 'e1071', 'survival'), repos='https://cloud.r-project.org/')"
@@ -139,12 +139,12 @@ jobs:
     - uses: actions/setup-ruby@v1
       with:
         ruby-version: '2.7'
-    - name: Install R
+    - uses: r-lib/actions/setup-r@v1
+      with:
+        r-version: '3.6.2'
+    - name: Install lib and pandoc
       run: |
-        echo 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/' | sudo tee -a /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 pandoc
+        sudo apt-get install -y libcurl4-openssl-dev pandoc
     - name: Install packages
       run: |
         pip install sphinx mkdocs numpy

From c6a8b12fc3ba58ea95bdca64732fa8934e884f2d Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 27 Apr 2020 21:07:20 -0700
Subject: [PATCH 2/2] Remove pandoc

---
 .github/workflows/master.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 5724ef2bf987e..4282504cc3984 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -106,9 +106,9 @@ jobs:
     - uses: r-lib/actions/setup-r@v1
       with:
         r-version: '3.6.2'
-    - name: Install lib and pandoc
+    - name: Install lib
       run: |
-        sudo apt-get install -y libcurl4-openssl-dev pandoc
+        sudo apt-get install -y libcurl4-openssl-dev
     - name: install R packages
       run: |
         sudo Rscript -e "install.packages(c('curl', 'xml2', 'httr', 'devtools', 'testthat', 'knitr', 'rmarkdown', 'roxygen2', 'e1071', 'survival'), repos='https://cloud.r-project.org/')"