Merge pull request #36 from rundel/master

Cleanup

.github/workflows/pkgdown.yaml

@@ -1,46 +1,48 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: master
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
 
 name: pkgdown
 
 jobs:
   pkgdown:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-pandoc@master
-
-      - name: Query dependencies
-        run: |
-          install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
 
-      - name: Cache R packages
-        uses: actions/cache@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+          extra-packages: any::pkgdown, local::.
+          needs: website
 
-      - name: Install dependencies
-        run: |
-          remotes::install_deps(dependencies = TRUE)
-          install.packages("pkgdown")
+      - name: Build site
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
         shell: Rscript {0}
 
-      - name: Install package
-        run: R CMD INSTALL .
-
-      - name: Deploy package
-        run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "GitHub Actions"
-          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
+      - name: Deploy to GitHub pages 🚀
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        with:
+          clean: false
+          branch: gh-pages
+          folder: docs

DESCRIPTION

@@ -30,7 +30,7 @@ Imports:
     magrittr,
     tidyselect (>= 1.2.0),
     lifecycle
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
 SystemRequirements: C++17
 LinkingTo: 
     Rcpp,

R/parsermd-package.R

@@ -1,23 +1,16 @@
-#' Stuff
-#'
-#' @name parsermd-package
-#' @aliases parsermd
-#' @docType package
-#' @title Stuff
-#' @author Colin Rundel \email{rundel@gmail.com}
-#' @keywords package
-NULL
+#' @keywords internal
+"_PACKAGE"
+
 
 ## usethis namespace: start
 #' @useDynLib parsermd, .registration = TRUE
 #' @importFrom Rcpp sourceCpp
+#' @importFrom rlang .data
+#' @importFrom magrittr %>%
 ## usethis namespace: end
 NULL
 
-#' @importFrom rlang .data
-NULL
 
-#' @importFrom magrittr %>%
 #' @export
 magrittr::`%>%`
 

R/print_tree.R

@@ -23,7 +23,6 @@ tree_node.rmd_yaml_list = function(x) {
   tree_node.rmd_yaml(unlist(x))
 }
 
-
 tree_node.rmd_heading = function(x) {
   list(
     text = "Heading",
@@ -52,7 +51,6 @@ tree_node.rmd_raw_chunk = function(x) {
   )
 }
 
-
 tree_node.rmd_markdown = function(x) {
   list(
     text = "Markdown",

_pkgdown.yml

@@ -1,4 +1,6 @@
 url: https://rundel.github.io/parsermd
+template:
+  bootstrap: 5
 
 navbar:
   type: default