Skip to content

Commit 7e6cdd9

Browse files
authored
ci: Import from actions-sync, check carefully (#510)
1 parent ae8d0e3 commit 7e6cdd9

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ jobs:
349349
needs:
350350
- rcc-smoke
351351

352-
runs-on: ubuntu-22.04
352+
runs-on: ubuntu-24.04
353353

354354
if: ${{ needs.rcc-smoke.outputs.dep-suggests-matrix != '' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.run-rcc-suggests)) }}
355355

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ get_deps <- function() {
1515

1616
# Too big to fail, or can't be avoided:
1717
off_limits <- c("testthat", "rmarkdown", "rcmdcheck", deps_df_hard, deps_df_base)
18-
off_limits_dep <- unlist(tools::package_dependencies(off_limits, recursive = TRUE, which = "strong"))
18+
off_limits_dep <- unlist(tools::package_dependencies(off_limits, db = installed.packages(), recursive = TRUE, which = "strong"))
1919
setdiff(packages, c(off_limits, off_limits_dep))
2020
}
2121

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ r_versions <- c("devel", as.character(r_release))
2222

2323
macos <- data.frame(os = "macos-latest", r = r_versions[2:3])
2424
windows <- data.frame(os = "windows-latest", r = r_versions[1:3])
25-
linux_devel <- data.frame(os = "ubuntu-22.04", r = r_versions[1], `http-user-agent` = "release", check.names = FALSE)
26-
linux <- data.frame(os = "ubuntu-22.04", r = r_versions[-1])
27-
covr <- data.frame(os = "ubuntu-22.04", r = r_versions[2], covr = "true", desc = "with covr")
25+
linux_devel <- data.frame(os = "ubuntu-24.04", r = r_versions[1], `http-user-agent` = "release", check.names = FALSE)
26+
linux <- data.frame(os = "ubuntu-24.04", r = r_versions[-1])
27+
covr <- data.frame(os = "ubuntu-24.04", r = r_versions[2], covr = "true", desc = "with covr")
2828

2929
include_list <- list(macos, windows, linux_devel, linux, covr)
3030

0 commit comments

Comments
 (0)