From 5009109fb14fb1361f53d7ab3c9bad161c7b5deb Mon Sep 17 00:00:00 2001 From: Chris Black Date: Wed, 24 Jun 2026 16:36:22 -0700 Subject: [PATCH] ensure deps and Roxygen are up to date before running pkgdown --- Makefile | 11 +++++++---- scripts/build_pkgdown.R | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 96aab4567b4..bb8572542d8 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,12 @@ recurse_dir = $(foreach d, $(wildcard $1*), $(call recurse_dir, $d/) $d) # For output from recurse_dir this removes all dirs, but in other cases beware. drop_parents = $(filter-out $(patsubst %/,%,$(dir $1)), $1) -# Generates a list of regular files at any depth inside its argument -files_in_dir = $(call drop_parents, $(call recurse_dir, $1)) +# Generates a list of regular files at any depth inside its argument, +# excluding those in any `docs` folder +files_in_dir = $(filter-out \ + ${1}/docs/%, \ + $(call drop_parents, $(call recurse_dir,$1))) + # Git hash + clean status for this directory git_rev = $(shell \ @@ -118,9 +122,8 @@ check_modules: $(BASE_I) $(MODULES_C) document: $(ALL_PKGS_D) .doc/base/all -pkgdocs: +pkgdocs: $(ALL_PKGS_D) .doc/base/all Rscript scripts/build_pkgdown.R $(ALL_PKGS) base/all || exit 1 - install: $(ALL_PKGS_I) .install/base/all check: $(ALL_PKGS_C) .check/base/all diff --git a/scripts/build_pkgdown.R b/scripts/build_pkgdown.R index 22b358d2b36..5b595a6968a 100755 --- a/scripts/build_pkgdown.R +++ b/scripts/build_pkgdown.R @@ -33,6 +33,7 @@ build_and_copy <- function(pkg, branch, outdir) { pkgdown::build_site( pkg = ".", + lazy = TRUE, override = list( "llm-docs" = FALSE, repo = list(url = list(source = url_str)),