Skip to content

Commit b1902ec

Browse files
Merge bfa8309 into 9305b62
2 parents 9305b62 + bfa8309 commit b1902ec

File tree

126 files changed

+2216
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2216
-290
lines changed

.Rbuildignore

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
^Meta$
2-
^doc$
1+
^.*-in_tree$
32
^.*\.Rproj$
4-
^\.Rproj\.user$
53
^API$
6-
^README\.Rmd$
4+
^CONTRIBUTING\.md$
5+
^LICENSE\.md$
6+
^Meta$
77
^README-.*\.png$
8-
^appveyor\.yml$
9-
^tic\.R$
10-
^docs$
11-
^_pkgdown\.yml$
12-
CONTRIBUTING.md
8+
^README\.Rmd$
9+
^\.Rproj\.user$
10+
^\.github$
1311
^\.gitsum$
14-
^gitsum$
15-
revdep
12+
^\.pre-commit-config\.yaml$
13+
^_pkgdown\.yml$
1614
^cran-comments\.md$
15+
^doc$
16+
^docs$
17+
^gitsum$
18+
^inst/WORDLIST$
19+
^inst/hooks/.*$
20+
^revdep$
1721
^tests/testmanual$
18-
^\.pre-commit-config\.yaml$
19-
^brew\-log$
20-
^\.github/$
22+
^tic\.R$
2123
^touchstone$
22-
^\.github$
23-
^LICENSE\.md$
24-
^inst/hooks/$
25-
^inst/WORDLIST$
24+
^vignettes/gsoc_proposal$

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tests/testthat/**/*_tree linguist-generated=true
1+
tests/testthat/**/*_tree linguist-generated=true

.github/workflows/R-CMD-check.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ on:
1616

1717
name: R-CMD-check
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.head_ref }}
21+
cancel-in-progress: true
22+
23+
1924
jobs:
2025
R-CMD-check:
2126
runs-on: ${{ matrix.config.os }}
@@ -27,9 +32,10 @@ jobs:
2732
matrix:
2833
config:
2934
- {os: macOS-latest, r: 'release'}
35+
- {os: windows-latest, r: 'devel'}
3036
- {os: windows-latest, r: 'release'}
31-
- {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
32-
- {os: ubuntu-18.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
37+
- {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
38+
- {os: ubuntu-18.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
3339
- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3440
- {os: ubuntu-18.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3541
- {os: ubuntu-18.04, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}

.github/workflows/cancel.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/check-full.yaml

Whitespace-only changes.

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: master
3+
branches: main
44

55
name: pkgdown
66

.github/workflows/pre-commit.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: pre-commit
2+
on:
3+
push:
4+
branches-ignore:
5+
- 'master'
6+
- 'main'
7+
pull_request:
8+
types: [opened, synchronize, reopened, ready_for_review]
9+
10+
jobs:
11+
pre-commit:
12+
runs-on: ubuntu-18.04
13+
if: >-
14+
!contains(github.event.head_commit.message, 'ci skip') &&
15+
(
16+
startsWith(github.ref, 'refs/heads') ||
17+
github.event.pull_request.draft == false
18+
)
19+
steps:
20+
- name: Cancel Previous Runs
21+
uses: styfle/cancel-workflow-action@0.6.0
22+
with:
23+
access_token: ${{ github.token }}
24+
- uses: actions/checkout@v2
25+
with:
26+
fetch-depth: 0
27+
- name: Install system dependencies
28+
if: runner.os == 'Linux'
29+
run: |
30+
# your system installation code here
31+
# sudo apt-get install -y libcurl4-openssl-dev
32+
- name: Set up Python
33+
uses: actions/setup-python@v2
34+
with:
35+
python-version: "3.9"
36+
architecture: "x64"
37+
- name: Run pre-commit
38+
uses: pre-commit/action@v2.0.3
39+
- name: Commit files
40+
if: failure() && startsWith(github.ref, 'refs/heads')
41+
run: |
42+
if [[ `git status --porcelain --untracked-files=no` ]]; then
43+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
44+
git config --local user.name "github-actions[bot]"
45+
git checkout -- .github/workflows
46+
git commit -m "pre-commit" -a
47+
fi
48+
- name: Push changes
49+
if: failure() && startsWith(github.ref, 'refs/heads')
50+
uses: ad-m/github-push-action@master
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
branch: ${{ github.ref }}
54+
env:
55+
RENV_CONFIG_CACHE_ENABLED: FALSE

.github/workflows/test-coverage.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
on:
22
push:
33
branches:
4-
- master
4+
- main
55
pull_request:
66
branches:
7-
- master
7+
- main
88

99
name: test-coverage
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref }}
13+
cancel-in-progress: true
14+
15+
1116
jobs:
1217
test-coverage:
1318
runs-on: macOS-latest

.github/workflows/touchstone-comment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Continuous Benchmarks (Comment)
22

3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.head_ref }}
5+
cancel-in-progress: true
6+
37
# read-write repo token
48
# access to secrets
59
on:

.github/workflows/touchstone-receive.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
name: Continuous Benchmarks (Receive)
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.head_ref }}
4+
cancel-in-progress: true
5+
26
on: pull_request
37
jobs:
48
prepare:

0 commit comments

Comments
 (0)