Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore develop #254

Merged
merged 30 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7e4a7ff
Develop (#251)
GuidoMaggio Aug 29, 2023
6d434c8
Develop (#253)
GuidoMaggio Aug 29, 2023
a902462
Update DataHub data
actions-user Aug 29, 2023
c32baac
Update DataHub data
actions-user Aug 30, 2023
958353d
Update DataHub data
actions-user Aug 31, 2023
6cc0a40
Update DataHub data
actions-user Sep 1, 2023
7bb5b73
Update DataHub data
actions-user Sep 2, 2023
1841eb2
Update DataHub data
actions-user Sep 3, 2023
deb6331
Update DataHub data
actions-user Sep 4, 2023
de1d372
Update DataHub data
actions-user Sep 5, 2023
1a710df
Update DataHub data
actions-user Sep 6, 2023
2ec18d3
Update DataHub data
actions-user Sep 7, 2023
5f8cedf
Update DataHub data
actions-user Sep 8, 2023
59a8ce8
Update DataHub data
actions-user Sep 9, 2023
59fbe5a
Update DataHub data
actions-user Sep 10, 2023
28591a2
Update DataHub data
actions-user Sep 11, 2023
5958860
Update DataHub data
actions-user Sep 12, 2023
974d225
Update DataHub data
actions-user Sep 13, 2023
0bf97f1
Update DataHub data
actions-user Sep 14, 2023
c1d4310
Update DataHub data
actions-user Sep 15, 2023
e9a691c
Update DataHub data
actions-user Sep 16, 2023
78b1dc1
Update DataHub data
actions-user Sep 17, 2023
a2609d3
Update DataHub data
actions-user Sep 18, 2023
f799cce
Update DataHub data
actions-user Sep 19, 2023
9281585
Update DataHub data
actions-user Sep 20, 2023
cac5311
Update DataHub data
actions-user Sep 21, 2023
6467d53
Merge branch 'develop' into fix-dev
GuidoMaggio Sep 22, 2023
b5bbbb9
4.2.1 r
GuidoMaggio Sep 22, 2023
173c4aa
restored renv
GuidoMaggio Sep 22, 2023
7b0b356
remlve install dev tool
GuidoMaggio Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .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.3.1'}
- {os: ubuntu-latest, r: '4.2.1'}

env:
# Access token for GitHub
Expand Down Expand Up @@ -55,9 +55,9 @@ 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: Install renv Development tools
# run: renv::install()
# shell: Rscript {0}

- name: Fetch and rebuild latest data
if: github.event_name == 'schedule'
Expand All @@ -84,7 +84,7 @@ jobs:
git push origin
- 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 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/deploy-shinyapps.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ options(rsconnect.packrat = TRUE)

rsconnect::deployApp(
account = "miraisolutions",
appName = "covid19-test",
appName = "covid19",
forceUpdate = TRUE # to be added since rsconnect >1
# exclude hidden files and renv directory (if present)
# appFiles = setdiff(list.files(), "renv")
Expand Down
Binary file modified inst/datahub/DATA.rds
Binary file not shown.
Binary file modified inst/datahub/Selected_Country.rds
Binary file not shown.
Binary file modified inst/datahub/Top_Countries.rds
Binary file not shown.
4,339 changes: 4,339 additions & 0 deletions manifest.json

Large diffs are not rendered by default.

Loading