Merge branch 'main' into mac-deps

* main:
  Revert Windows pak adjustments; Add debug step (#305)

Author: schloerke

.github/internal/install-shinyverse/action.yaml

@@ -48,8 +48,7 @@ runs:
         http-user-agent: ${{ inputs.http-user-agent }}
         pandoc-version: ${{ inputs.pandoc-version }}
         extra-packages: ${{ inputs.extra-packages }}
-      env:
-        RSPM: ${{ if (runner.os == 'Linux') &&  }}
+        pak-version: "devel"
 
     # - name: Get packages for macOS system dependencies
     #   if: runner.os == 'macOS'

.github/workflows/apps-config.yml

@@ -28,7 +28,7 @@ on:
         value: "https://p3m.dev/cran/__linux__/noble/latest"
       cache-version:
         description: cache-version to be used when pulling library cache
-        value: "8"
+        value: "13"
       devel:
         description: Resolved r devel version
         # When R 4.3 was released, R version 4.4.0 was not recognized.

.github/workflows/apps-test-os.yml

@@ -198,6 +198,11 @@ jobs:
           )
           shinycoreci::assert_test_output(test_output)
 
+        # > If the workflow run is a re-run, with debugging enabled, then it opens a tmate shell that you can ssh into for interactive debugging.
+      - uses: r-hub/actions/debug-shell@v1
+        if: always()
+        with:
+          connect-timeout-seconds: "300"
       - name: Remove R options file
         if: always()
         shell: bash

R/install-path.R

@@ -7,6 +7,13 @@ on_ci <- function() {
 #' @keywords internal
 resolve_libpath <- function(..., local_pkgs = FALSE) {
   stopifnot(length(list(...)) == 0)
+
+  # If running on CI, use the default libpath.
+  # No need to keep a separate library for local testing
+  if (on_ci()) {
+    return(.libPaths()[1])
+  }
+
   # If using local_pkgs, use the standard libpath location
   libpath <- if (isTRUE(local_pkgs)) .libPaths()[1] else shinycoreci_libpath()
   libpath

R/install.R

@@ -231,41 +231,29 @@ install_pkgs_with_callr <- function(
 ) {
   stopifnot(length(list(...)) == 0)
   callr::r(
-    function(repos_option, packages, upgrade, dependencies, is_windows) {
+    function(repos_option, packages, upgrade, dependencies) {
       options(repos = repos_option)
 
-      if (is_windows) {
-        message(
-          "Installing packages with install.packages(): ",
-          paste0(packages, collapse = ", ")
-        )
-        # Throw if any installation produces a warning
-        # Ex: In install.packages(packages) : installation of package 'terra' had non-zero exit status
-        options(warn = 2)
-        install.packages(packages)
-      } else {
-        # Performing a leap of faith that pak is installed.
-        # Avoids weird installs when using pak to install shinycoreci
-        stopifnot(utils::packageVersion("pak") >= "0.3.0")
-        pak__pkg_install <- utils::getFromNamespace("pkg_install", "pak")
-        message(
-          "Installing packages with pak::pkg_install(): ",
-          paste0(packages, collapse = ", ")
-        )
-        pak__pkg_install(
-          packages,
-          ask = FALSE, # Not interactive, so don't ask
-          upgrade = upgrade,
-          dependencies = dependencies
-        )
-      }
+      # Performing a leap of faith that pak is installed.
+      # Avoids weird installs when using pak to install shinycoreci
+      stopifnot(utils::packageVersion("pak") >= "0.3.0")
+      pak__pkg_install <- utils::getFromNamespace("pkg_install", "pak")
+      message(
+        "Installing packages with pak::pkg_install(): ",
+        paste0(packages, collapse = ", ")
+      )
+      pak__pkg_install(
+        packages,
+        ask = FALSE, # Not interactive, so don't ask
+        upgrade = upgrade,
+        dependencies = dependencies
+      )
     },
     list(
       repos_option = shinyverse_repos_option(),
       packages = packages,
       upgrade = upgrade,
-      dependencies = dependencies,
-      is_windows = is_windows()
+      dependencies = dependencies
     ),
     show = TRUE,
     libpath = libpath,