From 4a9e4c5202b4e432c382f28b55ea982211476e43 Mon Sep 17 00:00:00 2001
From: Stuart Lynn <stuart.lynn@databricks.com>
Date: Wed, 25 Oct 2023 12:47:34 +0100
Subject: [PATCH] testing `use-public-rspm` flag

---
 .github/actions/r_build/action.yml | 38 +++++++++++++++---------------
 R/install_deps.R                   |  9 ++++---
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/.github/actions/r_build/action.yml b/.github/actions/r_build/action.yml
index edf9caafe..3aea3d036 100644
--- a/.github/actions/r_build/action.yml
+++ b/.github/actions/r_build/action.yml
@@ -30,31 +30,31 @@ runs:
       run: |
         sudo mkdir -p /usr/lib/R/site-library
         sudo chown -R $USER: /usr/lib/R/site-library
-#    - name: Cache R packages download
-#      id: cache-rlibs
-#      uses: actions/cache@v3
-#      with:
-#        path: /usr/lib/R/site-library
-#        key: r_build-rlibs
-#    - if: ${{ steps.cache-rlibs.outputs.cache-hit != 'true' }}
-#      name: Install R dependencies
-#      shell: bash
-#      run: |
-#        cd R
-#        Rscript --vanilla install_deps.R
     - name: Setup R
       uses: r-lib/actions/setup-r@v2
       with:
         r-version: ${{ matrix.R }}
         use-public-rspm: true
-    - name: Install R dependencies
-      uses: r-lib/actions/setup-r-dependencies@v2
+    - name: Cache R packages download
+      id: cache-rlibs
+      uses: actions/cache@v3
       with:
-        cache: true
-        extra-packages: |
-          any::pkgbuild
-          any::roxygen2
-          any::sparklyr
+        path: /usr/lib/R/site-library
+        key: r_build-rlibs
+#    - if: ${{ steps.cache-rlibs.outputs.cache-hit != 'true' }}
+    - name: Install R dependencies
+      shell: bash
+      run: |
+        cd R
+        Rscript --vanilla install_deps.R
+#    - name: Install R dependencies
+#      uses: r-lib/actions/setup-r-dependencies@v2
+#      with:
+#        cache: true
+#        extra-packages: |
+#          any::pkgbuild
+#          any::roxygen2
+#          any::sparklyr
     - name: Generate R bindings
       shell: bash
       run: |
diff --git a/R/install_deps.R b/R/install_deps.R
index 68cb8a355..0bfb6f6ed 100644
--- a/R/install_deps.R
+++ b/R/install_deps.R
@@ -31,6 +31,9 @@ for(repo in names(mirror_status)){
 
 .libPaths(c("/usr/lib/R/site-library", .libPaths()))
 
-install.packages("pkgbuild", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
-install.packages("roxygen2", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
-install.packages("sparklyr", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
\ No newline at end of file
+# install.packages("pkgbuild", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+# install.packages("roxygen2", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+# install.packages("sparklyr", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+install.packages("pkgbuild")
+install.packages("roxygen2")
+install.packages("sparklyr")
\ No newline at end of file