Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

hoad 2.0 relaunch #278

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ hoad.code-workspace
^R/.unpaywall_integration\.R$
.vscode
.azure
.radian_history
^\.Rproj\.user$
29 changes: 1 addition & 28 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
shell: Rscript {0}
container:
# update muggle here and in Dockerfile
image: subugoe/muggle-buildtime-onbuild:0.1.1-20210126
image: subugoe/muggle-buildtime-onbuild:0.1.2-20211124
env:
MUGGLE_PKG_NAME: ${{ github.event.repository.name }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -50,33 +50,6 @@ jobs:
tags: ${{ github.sha }}
add_git_labels: true
push: ${{ github.event_name != 'pull_request' }}
- name: Build Runtime Image
uses: docker/build-push-action@v1
with:
repository: ${{ github.repository }}/${{ env.MUGGLE_PKG_NAME }}-runtime
target: runtime
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: docker.pkg.github.com
# this will set "latest" if master as per https://github.com/docker/build-push-action
tag_with_ref: true
# we're relying on long shas only to keep things easy
tag_with_sha: false
tags: ${{ github.sha }}
add_git_labels: true
push: ${{ github.event_name != 'pull_request' }}
- name: Deploy Shiny Application to shinyapps.io ref
env:
SHINYAPPS_TOKEN: ${{ secrets.SHINYAPPS_TOKEN }}
SHINYAPPS_SECRET: ${{ secrets.SHINYAPPS_SECRET }}
GITHUB_REF: ${{ github.ref }}
if: github.event_name != 'pull_request'
run: |
remotes::install_github(repo = "subugoe/hoad", ref = "master", force = TRUE, dependencies = TRUE)
rsconnect::setAccountInfo(name = 'subugoe', token = Sys.getenv('SHINYAPPS_TOKEN'), secret = Sys.getenv('SHINYAPPS_SECRET'))
app_name <- paste0("hoad-", gsub("/", "-", Sys.getenv('GITHUB_REF')))
rsconnect::deployDoc(doc = "inst/app/dashboard.Rmd", appName = app_name)
shell: Rscript {0}
- name: Deploy to GitHub Pages
if: github.ref == 'refs/heads/master'
uses: maxheld83/ghpages@github-token
Expand Down
44 changes: 5 additions & 39 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: hoad
Title: Hybrid Open Access Dashboard
Version: 1.0.1.9000
Version: 2.0.0.9000
Authors@R:
c(
person(
Expand Down Expand Up @@ -49,46 +49,12 @@ Language: en
LazyData: true
Roxygen: list(markdown = TRUE)
Suggests:
rmarkdown,
jsonlite,
ggalt,
scales,
forcats,
cowplot,
readxl,
flexdashboard,
viridis,
plotly,
shiny,
DT,
writexl,
echarts4r,
DBI,
dbplyr,
haven,
lubridate,
modelr,
reprex,
rsconnect,
rvest,
selectr,
httr,
purrr,
covr,
testthat,
subugoetheme,
shinycaas
subugoetheme
URL: https://subugoe.github.io/hoad, https://github.com/subugoe/hoad/
BugReports: https://github.com/subugoe/hoad/issues
RoxygenNote: 7.1.1.9999
Imports:
dplyr,
checkmate,
magrittr,
readr,
fs,
ggplot2,
rlang
Remotes:
subugoe/subugoetheme@1.1.1,
subugoe/shinycaas@1.0.0
fs
Remotes:
subugoe/subugoetheme@1.1.1
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
ARG MUGGLE_TAG=0.1.1-20210126
ARG MUGGLE_TAG=0.1.2-20211124
FROM subugoe/muggle-buildtime-onbuild:${MUGGLE_TAG} as buildtime
FROM subugoe/muggle-runtime-onbuild:${MUGGLE_TAG} as runtime
CMD shinycaas::shiny_opts_az(); hoad::runHOAD()
19 changes: 0 additions & 19 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,21 +1,2 @@
# Generated by roxygen2: do not edit by hand

export("%>%")
export(colors_license)
export(colors_license_unpaywall)
export(colors_source_disclosure)
export(hybrid_publications)
export(license_patterns)
export(oa_by_license)
export(oa_by_license_plot)
export(oa_by_other)
export(oa_by_other_plot)
export(path_extdat)
export(runHOAD)
export(unpaywall_df)
import(checkmate)
import(dplyr)
import(ggplot2)
import(readr)
importFrom(magrittr,"%>%")
importFrom(rlang,.data)
9 changes: 0 additions & 9 deletions R/.add_emails.R

This file was deleted.

244 changes: 0 additions & 244 deletions R/.cr_fetching.R

This file was deleted.

Loading