From e8e28de2b13c1fdf9e608c3acfd1bc4fe23c14b7 Mon Sep 17 00:00:00 2001 From: Nicolas Casajus Date: Thu, 26 Oct 2023 09:57:29 +0200 Subject: [PATCH] fix: add builignore .github/ in add_github_actions_*() - fix #56 --- R/add_github_actions_check.R | 2 ++ R/add_github_actions_citation.R | 2 ++ R/add_github_actions_codecov.R | 2 ++ R/add_github_actions_document.R | 2 ++ R/add_github_actions_pkgdown.R | 2 ++ R/add_github_actions_render.R | 4 +++- R/new_compendium.R | 5 ----- R/new_package.R | 5 ----- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/R/add_github_actions_check.R b/R/add_github_actions_check.R index 98161a7..e5ff688 100644 --- a/R/add_github_actions_check.R +++ b/R/add_github_actions_check.R @@ -69,6 +69,8 @@ add_github_actions_check <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "R-CMD-check.yaml"), package = "rcompendium"), path)) diff --git a/R/add_github_actions_citation.R b/R/add_github_actions_citation.R index da19aab..ae4792f 100644 --- a/R/add_github_actions_citation.R +++ b/R/add_github_actions_citation.R @@ -66,6 +66,8 @@ add_github_actions_citation <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "update-citation-cff.yaml"), package = "rcompendium"), path)) diff --git a/R/add_github_actions_codecov.R b/R/add_github_actions_codecov.R index d9e5f48..ca53021 100644 --- a/R/add_github_actions_codecov.R +++ b/R/add_github_actions_codecov.R @@ -63,6 +63,8 @@ add_github_actions_codecov <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "test-coverage.yaml"), package = "rcompendium"), path)) diff --git a/R/add_github_actions_document.R b/R/add_github_actions_document.R index 8c71e95..3a53e62 100644 --- a/R/add_github_actions_document.R +++ b/R/add_github_actions_document.R @@ -65,6 +65,8 @@ add_github_actions_document <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "document-package.yaml"), package = "rcompendium"), path)) diff --git a/R/add_github_actions_pkgdown.R b/R/add_github_actions_pkgdown.R index cd0f2e9..a3f1744 100644 --- a/R/add_github_actions_pkgdown.R +++ b/R/add_github_actions_pkgdown.R @@ -64,6 +64,8 @@ add_github_actions_pkgdown <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "pkgdown.yaml"), package = "rcompendium"), path)) diff --git a/R/add_github_actions_render.R b/R/add_github_actions_render.R index 04d57e4..8403d50 100644 --- a/R/add_github_actions_render.R +++ b/R/add_github_actions_render.R @@ -64,12 +64,14 @@ add_github_actions_render <- function(open = FALSE, overwrite = FALSE, dir.create(file.path(path_proj(), ".github", "workflows"), showWarnings = FALSE, recursive = TRUE) + add_to_buildignore(".github", quiet = FALSE) + invisible( file.copy(system.file(file.path("templates", "render-README.yaml"), package = "rcompendium"), path)) - if (!quiet) + if (!quiet) ui_done("Writing {ui_value('.github/workflows/render-README.yaml')} file") if (open) edit_file(path) diff --git a/R/new_compendium.R b/R/new_compendium.R index aa80fc1..9447004 100644 --- a/R/new_compendium.R +++ b/R/new_compendium.R @@ -658,7 +658,6 @@ new_compendium <- function(compendium = NULL, license = "GPL (>= 2)", ui_title("Configuring GH Actions - R CMD CHECK") add_github_actions_check(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -674,7 +673,6 @@ new_compendium <- function(compendium = NULL, license = "GPL (>= 2)", ui_title("Configuring GH Actions - Code Coverage") add_github_actions_codecov(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -690,7 +688,6 @@ new_compendium <- function(compendium = NULL, license = "GPL (>= 2)", ui_title("Configuring GH Actions - Render README") add_github_actions_render(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -706,7 +703,6 @@ new_compendium <- function(compendium = NULL, license = "GPL (>= 2)", ui_title("Configuring GH Actions - Website deployment") add_github_actions_pkgdown() - add_to_buildignore(".github", quiet = quiet) ui_line() @@ -726,7 +722,6 @@ new_compendium <- function(compendium = NULL, license = "GPL (>= 2)", ui_title("Configuring GH Actions - CITATION.cff") add_github_actions_citation(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } diff --git a/R/new_package.R b/R/new_package.R index 5c5a002..6b37177 100644 --- a/R/new_package.R +++ b/R/new_package.R @@ -706,7 +706,6 @@ new_package <- function(license = "GPL (>= 2)", status = NULL, ui_title("Configuring GH Actions - R CMD CHECK") add_github_actions_check(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -722,7 +721,6 @@ new_package <- function(license = "GPL (>= 2)", status = NULL, ui_title("Configuring GH Actions - Code Coverage") add_github_actions_codecov(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -738,7 +736,6 @@ new_package <- function(license = "GPL (>= 2)", status = NULL, ui_title("Configuring GH Actions - Render README") add_github_actions_render(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) } @@ -754,7 +751,6 @@ new_package <- function(license = "GPL (>= 2)", status = NULL, ui_title("Configuring GH Actions - Website deployment") add_github_actions_pkgdown() - add_to_buildignore(".github", quiet = quiet) ui_line() @@ -774,7 +770,6 @@ new_package <- function(license = "GPL (>= 2)", status = NULL, ui_title("Configuring GH Actions - CITATION.cff") add_github_actions_citation(quiet = quiet) - add_to_buildignore(".github", quiet = quiet) }