Merge c43c99d into 9305b62

.Rbuildignore

@@ -1,25 +1,24 @@
-^Meta$
-^doc$
+^.*-in_tree$
 ^.*\.Rproj$
-^\.Rproj\.user$
 ^API$
-^README\.Rmd$
+^CONTRIBUTING\.md$
+^LICENSE\.md$
+^Meta$
 ^README-.*\.png$
-^appveyor\.yml$
-^tic\.R$
-^docs$
-^_pkgdown\.yml$
-CONTRIBUTING.md
+^README\.Rmd$
+^\.Rproj\.user$
+^\.github$
 ^\.gitsum$
-^gitsum$
-revdep
+^\.pre-commit-config\.yaml$
+^_pkgdown\.yml$
 ^cran-comments\.md$
+^doc$
+^docs$
+^gitsum$
+^inst/WORDLIST$
+^inst/hooks/.*$
+^revdep$
 ^tests/testmanual$
-^\.pre-commit-config\.yaml$
-^brew\-log$
-^\.github/$
+^tic\.R$
 ^touchstone$
-^\.github$
-^LICENSE\.md$
-^inst/hooks/$
-^inst/WORDLIST$
+^vignettes/gsoc_proposal$

.gitattributes

@@ -1 +1 @@
-tests/testthat/**/*_tree linguist-generated=true
+tests/testthat/**/*_tree linguist-generated=true

.github/workflows/check-full.yaml

@@ -0,0 +1,63 @@
+# 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: [main, master]
+  pull_request:
+    branches: [main, master]
+
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macOS-latest,   r: 'release'}
+
+          - {os: windows-latest, r: 'release'}
+          # Use 3.6 to trigger usage of RTools35
+          - {os: windows-latest, r: '3.6'}
+
+          # Use older ubuntu to maximise backward compatibility
+          - {os: ubuntu-18.04,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-18.04,   r: 'release'}
+          - {os: ubuntu-18.04,   r: 'oldrel-1'}
+          - {os: ubuntu-18.04,   r: 'oldrel-2'}
+          - {os: ubuntu-18.04,   r: 'oldrel-3'}
+          - {os: ubuntu-18.04,   r: 'oldrel-4'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck, data.tree=?ignore-before-r=3.5.0
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        env:
+          _R_CHECK_FORCE_SUGGESTS_: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true

.github/workflows/pkgdown.yaml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: master
+    branches: main
 
 name: pkgdown
 
@@ -44,3 +44,7 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Actions"
           Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true

.github/workflows/pr-commands.yaml

@@ -42,6 +42,22 @@ jobs:
       - uses: r-lib/actions/setup-r@master
       - name: Install dependencies
         run: Rscript -e 'install.packages("styler")'
+      - name: save R.cache location
+        id: save-r-cache-location
+        run: |
+          cat("##[set-output name=r-cache-location;]", R.cache::getCacheRootPath(), "\n", sep = "")
+        shell: Rscript {0}
+      - name: R.cache cache
+        uses: actions/cache@v2
+        env:
+          cache-name: r-cache
+        with:
+          path: ${{ r-cache-location }}
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-
+            ${{ runner.os }}-
+
       - name: Style
         run: Rscript -e 'styler::style_pkg()'
       - name: commit

.github/workflows/pre-commit.yaml

@@ -0,0 +1,55 @@
+name: pre-commit
+on:
+  push:
+    branches-ignore:
+      - 'master'
+      - 'main'
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-18.04
+    if: >-
+      !contains(github.event.head_commit.message, 'ci skip') &&
+      (
+        startsWith(github.ref, 'refs/heads') ||
+        github.event.pull_request.draft == false
+      )
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install system dependencies
+        if: runner.os == 'Linux'
+        run: |
+          # your system installation code here
+          # sudo apt-get install -y libcurl4-openssl-dev
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+          architecture: "x64"
+      - name: Run pre-commit
+        uses: pre-commit/[email protected]
+      - name: Commit files
+        if: failure() && startsWith(github.ref, 'refs/heads')
+        run: |
+          if [[ `git status --porcelain --untracked-files=no` ]]; then
+            git config --local user.email "github-actions[bot]@users.noreply.github.com"
+            git config --local user.name "github-actions[bot]"
+            git checkout -- .github/workflows
+            git commit -m "pre-commit" -a
+          fi
+      - name: Push changes
+        if: failure() && startsWith(github.ref, 'refs/heads')
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}
+    env:
+      RENV_CONFIG_CACHE_ENABLED: FALSE

.github/workflows/test-coverage.yaml

@@ -1,10 +1,10 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 name: test-coverage
 
@@ -44,3 +44,7 @@ jobs:
       - name: Test coverage
         run: covr::codecov()
         shell: Rscript {0}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true