Skip to content

Commit

Permalink
Merge branch 'develop' into fix-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
GuidoMaggio authored Sep 22, 2023
2 parents cac5311 + 5a41323 commit 6467d53
Show file tree
Hide file tree
Showing 7 changed files with 268 additions and 538 deletions.
2 changes: 0 additions & 2 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# renv::settings$ignored.packages(c("devtools", "Covid19Mirai"), persist = FALSE)
source("renv/activate.R")

6 changes: 5 additions & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# single OS and R version, aligned with the target deployment environment
matrix:
config:
- {os: ubuntu-latest, r: '4.2.1'}
- {os: ubuntu-latest, r: '4.3.1'}

env:
# Access token for GitHub
Expand Down Expand Up @@ -55,6 +55,10 @@ jobs:
- name: Activate renv and restore packages with cache
uses: r-lib/actions/setup-renv@v2

- name: Install renv Development tools
run: renv::install()
shell: Rscript {0}

- name: Fetch and rebuild latest data
if: github.event_name == 'schedule'
run: |
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Imports:
scales,
COVID19,
grDevices,
pkgload,
rlang,
zoo
Encoding: UTF-8
Expand All @@ -47,6 +46,7 @@ RoxygenNote: 7.2.3
Suggests:
rsconnect,
spelling,
pkgload,
testthat (>= 3.0.0),
sf,
packrat
5 changes: 2 additions & 3 deletions deploy/deploy-shinyapps.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ rsconnect::setAccountInfo(
)

# to be added since rsconnect >1
options(rsconnect.packrat = FALSE)
options(rsconnect.packrat = TRUE)

rsconnect::deployApp(
account = "miraisolutions",
appName = "covid19",
forceUpdate = TRUE, # to be added since rsconnect >1
quarto = FALSE # to be added since rsconnect >1
forceUpdate = TRUE # to be added since rsconnect >1
# exclude hidden files and renv directory (if present)
# appFiles = setdiff(list.files(), "renv")
)
Loading

0 comments on commit 6467d53

Please sign in to comment.