From 4237aef730c051d71ca455518eedac558bd5e3db Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 15:01:08 +0200 Subject: [PATCH 1/5] Test deployment failure --- .github/workflows/workflow.yml | 2 +- DESCRIPTION | 2 +- deploy/deploy-shinyapps.R | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a6ad902..43cb20f 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,7 +68,7 @@ jobs: - name: Deploy to shinyapps.io # Continuous deployment only for pushes to the main / master branch - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' + # if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' env: SHINYAPPS_ACCOUNT: ${{ secrets.SHINYAPPS_ACCOUNT }} SHINYAPPS_TOKEN: ${{ secrets.SHINYAPPS_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index a012b41..d6a85fd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,7 +8,6 @@ Imports: config (>= 0.3.2), golem (>= 0.4.1), graphics, - pkgload, shiny (>= 1.8.1.1) Encoding: UTF-8 LazyData: true @@ -17,6 +16,7 @@ URL: https://github.com/guidomaggioorg/shinyfaithful BugReports: https://github.com/guidomaggioorg/shinyfaithful/issues Suggests: rsconnect, + pkgload, spelling, testthat (>= 3.0.0) Config/testthat/edition: 3 diff --git a/deploy/deploy-shinyapps.R b/deploy/deploy-shinyapps.R index 06bd434..fb6f2e1 100644 --- a/deploy/deploy-shinyapps.R +++ b/deploy/deploy-shinyapps.R @@ -13,12 +13,10 @@ app_files = c( "DESCRIPTION", "NAMESPACE", "R/", - "inst/", - "renv.lock", - ".rscignore" + "inst/" ) # options(rsconnect.packrat = TRUE) rsconnect::deployApp( account = "gmaggio", # not necessary - appName = "FaithfulPlots", appFiles = app_files, forceUpdate = TRUE + appName = "FaithfulPlotsTest", appFiles = app_files, forceUpdate = TRUE ) From 19058bdee18d000452e9b2b5597aeadcaf3c6619 Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 15:09:08 +0200 Subject: [PATCH 2/5] pkgload in DESCRIPTION imports --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index d6a85fd..a012b41 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,6 +8,7 @@ Imports: config (>= 0.3.2), golem (>= 0.4.1), graphics, + pkgload, shiny (>= 1.8.1.1) Encoding: UTF-8 LazyData: true @@ -16,7 +17,6 @@ URL: https://github.com/guidomaggioorg/shinyfaithful BugReports: https://github.com/guidomaggioorg/shinyfaithful/issues Suggests: rsconnect, - pkgload, spelling, testthat (>= 3.0.0) Config/testthat/edition: 3 From 48f182c7d48e990f55196b917b9dbe90b4e69bb1 Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 15:11:49 +0200 Subject: [PATCH 3/5] pkgload in NAMESPACE --- NAMESPACE | 1 + R/shinyfaithful-package.R | 7 +++++++ man/shinyfaithful-package.Rd | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 R/shinyfaithful-package.R create mode 100644 man/shinyfaithful-package.Rd diff --git a/NAMESPACE b/NAMESPACE index abbe80c..6ab9621 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,4 +8,5 @@ importFrom(golem,bundle_resources) importFrom(golem,favicon) importFrom(golem,with_golem_options) importFrom(graphics,hist) +importFrom(pkgload,load_all) importFrom(shiny,shinyApp) diff --git a/R/shinyfaithful-package.R b/R/shinyfaithful-package.R new file mode 100644 index 0000000..0840e48 --- /dev/null +++ b/R/shinyfaithful-package.R @@ -0,0 +1,7 @@ +#' @keywords internal +"_PACKAGE" + +## usethis namespace: start +#' @importFrom pkgload load_all +## usethis namespace: end +NULL diff --git a/man/shinyfaithful-package.Rd b/man/shinyfaithful-package.Rd new file mode 100644 index 0000000..50ab08a --- /dev/null +++ b/man/shinyfaithful-package.Rd @@ -0,0 +1,23 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/shinyfaithful-package.R +\docType{package} +\name{shinyfaithful-package} +\alias{shinyfaithful} +\alias{shinyfaithful-package} +\title{shinyfaithful: Shiny4 workshop pkg} +\description{ +Package used for the 4th course of the Series Intro to Shiny. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/guidomaggioorg/shinyfaithful} + \item Report bugs at \url{https://github.com/guidomaggioorg/shinyfaithful/issues} +} + +} +\author{ +\strong{Maintainer}: Guido Maggio \email{guido.maggio@mirai-solutions.com} + +} +\keyword{internal} From a55672b137e732d54de60f8369fa69fde90d216e Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Fri, 17 May 2024 16:32:38 +0200 Subject: [PATCH 4/5] productive deployment --- .github/workflows/workflow.yml | 2 +- deploy/deploy-shinyapps.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 43cb20f..a6ad902 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -68,7 +68,7 @@ jobs: - name: Deploy to shinyapps.io # Continuous deployment only for pushes to the main / master branch - # if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' env: SHINYAPPS_ACCOUNT: ${{ secrets.SHINYAPPS_ACCOUNT }} SHINYAPPS_TOKEN: ${{ secrets.SHINYAPPS_TOKEN }} diff --git a/deploy/deploy-shinyapps.R b/deploy/deploy-shinyapps.R index fb6f2e1..eac8e71 100644 --- a/deploy/deploy-shinyapps.R +++ b/deploy/deploy-shinyapps.R @@ -18,5 +18,5 @@ app_files = c( # options(rsconnect.packrat = TRUE) rsconnect::deployApp( account = "gmaggio", # not necessary - appName = "FaithfulPlotsTest", appFiles = app_files, forceUpdate = TRUE + appName = "FaithfulPlots", appFiles = app_files, forceUpdate = TRUE ) From 98cd92d2ca2aeb364a9bd418a9a78fae3b380588 Mon Sep 17 00:00:00 2001 From: GuidoMaggio Date: Mon, 20 May 2024 14:16:49 +0200 Subject: [PATCH 5/5] Restored deployment 1.1.1 --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a012b41..88c81ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: shinyfaithful Title: Shiny4 workshop pkg -Version: 1.1.0 +Version: 1.1.1 Authors@R: person('Guido', 'Maggio', email = 'guido.maggio@mirai-solutions.com', role = c('cre', 'aut')) Description: Package used for the 4th course of the Series Intro to Shiny. License: MIT + file LICENSE diff --git a/NEWS.md b/NEWS.md index ac02e82..18134c4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# shinyfaithful 1.1.1 + +* Restored deployment + # shinyfaithful 1.1.0 * Correction deployment