diff --git a/.github/workflows/hook-dependencies-update.yml b/.github/workflows/hook-dependencies-update.yml index 63d692621..72c80e7da 100644 --- a/.github/workflows/hook-dependencies-update.yml +++ b/.github/workflows/hook-dependencies-update.yml @@ -32,14 +32,17 @@ jobs: sudo -s eval "$sysreqs" - name: update existing packages run: | - options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/latest")) - install.packages('renv') - install.packages('jsonlite') - renv_deps <- names(jsonlite::read_json('renv.lock')$Packages) + options( + repos = c(CRAN = "https://packagemanager.rstudio.com/all/latest"), + install.packages.compile.from.source = "never" + ) + install.packages("renv") + install.packages("jsonlite") + renv_deps <- names(jsonlite::read_json("renv.lock")$Packages) renv::load() renv::restore(prompt = FALSE) can_be_updated <- renv::update(renv_deps, prompt = FALSE) - renv::snapshot(packages = renv_deps) + renv::snapshot(packages = renv_deps, prompt = FALSE) shell: Rscript {0} - name: update dependency graph among packages run: | diff --git a/renv.lock b/renv.lock index 01b71a09f..224863ff0 100644 --- a/renv.lock +++ b/renv.lock @@ -24,18 +24,18 @@ }, "R.methodsS3": { "Package": "R.methodsS3", - "Version": "1.8.1", + "Version": "1.8.2", "Source": "Repository", - "Repository": "CRAN", - "Hash": "4bf6453323755202d5909697b6f7c109", + "Repository": "RSPM", + "Hash": "278c286fd6e9e75d0c2e8f731ea445c8", "Requirements": [] }, "R.oo": { "Package": "R.oo", - "Version": "1.24.0", + "Version": "1.25.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "5709328352717e2f0a9c012be8a97554", + "Repository": "RSPM", + "Hash": "a0900a114f4f0194cf4aa8cd4a700681", "Requirements": [ "R.methodsS3" ] @@ -302,15 +302,10 @@ }, "lintr": { "Package": "lintr", - "Version": "2.0.1.9000", - "Source": "GitHub", - "RemoteType": "github", - "RemoteUsername": "jimhester", - "RemoteRepo": "lintr", - "RemoteRef": "HEAD", - "RemoteSha": "1ae01287f9c97536e097715beb08e88a25632067", - "RemoteHost": "api.github.com", - "Hash": "4d0a806974012edb045272ac3fcf9e72", + "Version": "3.0.0", + "Source": "Repository", + "Repository": "RSPM", + "Hash": "1214604176fb93fdcac030fc5d2177d9", "Requirements": [ "backports", "codetools", @@ -377,10 +372,10 @@ }, "processx": { "Package": "processx", - "Version": "3.5.3", + "Version": "3.6.0", "Source": "Repository", "Repository": "RSPM", - "Hash": "8bbae1a548d0d3fdf6647bdd9d35bf6d", + "Hash": "4acae60adac4791e8c8833d8494f270d", "Requirements": [ "R6", "ps" diff --git a/renv/activate.R b/renv/activate.R index 99b70024f..f958df789 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -54,7 +54,7 @@ local({ # mask 'utils' packages, will come first on the search path library(utils, lib.loc = .Library) - # unload renv if it's already been laoded + # unload renv if it's already been loaded if ("renv" %in% loadedNamespaces()) unloadNamespace("renv") @@ -314,9 +314,18 @@ local({ } # bail if it doesn't exist - if (!file.exists(tarball)) + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "* RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail return() + } + fmt <- "* Bootstrapping with tarball at path '%s'." msg <- sprintf(fmt, tarball) message(msg) @@ -800,7 +809,7 @@ local({ # find strings in the JSON pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' - locs <- gregexpr(pattern, text)[[1]] + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] # if any are found, replace them with placeholders replaced <- text diff --git a/vignettes/hook-order.Rmd b/vignettes/no_pkgdown/hook-order.Rmd similarity index 100% rename from vignettes/hook-order.Rmd rename to vignettes/no_pkgdown/hook-order.Rmd diff --git a/vignettes/testing.Rmd b/vignettes/no_pkgdown/testing.Rmd similarity index 100% rename from vignettes/testing.Rmd rename to vignettes/no_pkgdown/testing.Rmd