From d7bde7021f1c475dcad8f9a0f010abeb74d56552 Mon Sep 17 00:00:00 2001 From: jangorecki Date: Fri, 24 Nov 2023 17:07:39 +0100 Subject: [PATCH] upgrade for structure from newer R version --- .ci/publish.R | 2 +- .gitlab-ci.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/publish.R b/.ci/publish.R index 526d9bd80..16521fc0e 100644 --- a/.ci/publish.R +++ b/.ci/publish.R @@ -148,7 +148,7 @@ lib.copy <- function(lib.from, repodir="bus/integration/cran"){ pkg.copy <- function(pkg.from, lib.to) { pkg<-basename(pkg.from); dir.create(file.path(lib.to, pkg), recursive=TRUE) - lib.dirs<-intersect(c("html","doc"), all.lib.dirs<-list.dirs(pkg.from, full.names=FALSE)) + lib.dirs<-intersect(c("help","html","doc"), all.lib.dirs<-list.dirs(pkg.from, full.names=FALSE)) ans1<-setNames(file.copy(file.path(pkg.from, lib.dirs), file.path(lib.to, pkg), recursive=TRUE), lib.dirs) lib.files<-setdiff(list.files(pkg.from), all.lib.dirs) ans2<-setNames(file.copy(file.path(pkg.from, lib.files), file.path(lib.to, pkg)), lib.files) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e866d82db..90b4184ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,6 +339,7 @@ integration: - glci5 ## testing before merge needs: ["mirror-packages","build","test-rel-lin","test-rel-cran-lin","test-dev-cran-lin","test-rel-vanilla-lin","test-310-cran-lin","test-rel-win","test-dev-win","test-old-win"] script: + - R --version - Rscript -e 'pkgdown::build_site(override=list(destination="./pkgdown"))' ## html manual, vignettes, repos, cran_web, cran_checks - echo 'source(".ci/ci.R"); source(".ci/publish.R")' >> .Rprofile