From 7d9d7ffcd77c4b7f1b1e4493eae5fd055e3e3733 Mon Sep 17 00:00:00 2001 From: Carson Date: Thu, 28 Mar 2024 16:22:15 -0500 Subject: [PATCH 1/2] Only capture differences to inst/apps when generating patch files in fix_snaps() --- R/fix_snaps.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/fix_snaps.R b/R/fix_snaps.R index d10149fe12..9b4a11da7e 100644 --- a/R/fix_snaps.R +++ b/R/fix_snaps.R @@ -103,7 +103,7 @@ fix_snaps <- function( # Make patch file given diff # git_cmd_(paste0("git format-patch '", original_git_branch, "' --stdout > ", patch_file)) - git_cmd_("git diff --binary ", original_git_branch, " > ", patch_file) + git_cmd_("git diff --binary ", original_git_branch, " -- inst/apps > ", patch_file) } patch_file From 2e710a5f09e5f290b9631839b3a43f432b30aae3 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Thu, 28 Mar 2024 21:34:08 +0000 Subject: [PATCH 2/2] `devtools::document()` (GitHub Actions) --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2426369b64..987366102d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -10,7 +10,7 @@ Description: Core shiny team tools to facilitate testing of the shiny-verse. License: MIT + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Imports: jsonlite, progress,