ci: Tweaks (#541)

* ci: Tweaks

* ci: Fix comment

Author: krlmlr

.github/workflows/R-CMD-check.yaml

@@ -134,7 +134,8 @@ jobs:
 
       - id: versions-matrix
         # Only run for:
-        # - pull requests if the base repo is different from the head repo and the branch name does not start with "cran-"
+        # - pull requests if the base repo is different from the head repo
+        # - pull requests if the branch name starts with "cran-"
         # Do not run for:
         # - workflow_dispatch if not requested
         # Always run for other events.
@@ -349,7 +350,7 @@ jobs:
     needs:
       - rcc-smoke
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     if: ${{ needs.rcc-smoke.outputs.dep-suggests-matrix != '' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.run-rcc-suggests)) }}
 

.github/workflows/dep-suggests-matrix/action.R

@@ -15,7 +15,7 @@ get_deps <- function() {
 
   # Too big to fail, or can't be avoided:
   off_limits <- c("testthat", "rmarkdown", "rcmdcheck", deps_df_hard, deps_df_base)
-  off_limits_dep <- unlist(tools::package_dependencies(off_limits, recursive = TRUE, which = "strong"))
+  off_limits_dep <- unlist(tools::package_dependencies(off_limits, db = installed.packages(), recursive = TRUE, which = "strong"))
   setdiff(packages, c(off_limits, off_limits_dep))
 }
 

.github/workflows/versions-matrix/action.R

@@ -22,9 +22,9 @@ r_versions <- c("devel", as.character(r_release))
 
 macos <- data.frame(os = "macos-latest", r = r_versions[2:3])
 windows <- data.frame(os = "windows-latest", r = r_versions[1:3])
-linux_devel <- data.frame(os = "ubuntu-22.04", r = r_versions[1], `http-user-agent` = "release", check.names = FALSE)
-linux <- data.frame(os = "ubuntu-22.04", r = r_versions[-1])
-covr <- data.frame(os = "ubuntu-22.04", r = r_versions[2], covr = "true", desc = "with covr")
+linux_devel <- data.frame(os = "ubuntu-24.04", r = r_versions[1], `http-user-agent` = "release", check.names = FALSE)
+linux <- data.frame(os = "ubuntu-24.04", r = r_versions[-1])
+covr <- data.frame(os = "ubuntu-24.04", r = r_versions[2], covr = "true", desc = "with covr")
 
 include_list <- list(macos, windows, linux_devel, linux, covr)