testing use-public-rspm flag

databrickslabs · Oct 25, 2023 · 4a9e4c5 · 4a9e4c5
1 parent 280f003
commit 4a9e4c5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git 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
@@ -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")
+# 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")