Skip to content

Commit 3d83787

Browse files
Merge branch 'main' into lorenzwalthert-patch-1
2 parents f746ab0 + 96745a0 commit 3d83787

File tree

3 files changed

+27
-50
lines changed

3 files changed

+27
-50
lines changed

.github/workflows/check-full.yaml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
43
on:
54
push:
65
branches: [main, master]
76
pull_request:
87
branches: [main, master]
98

10-
119
name: R-CMD-check
1210

1311
jobs:
@@ -20,26 +18,27 @@ jobs:
2018
fail-fast: false
2119
matrix:
2220
config:
23-
- {os: macOS-latest, r: 'release'}
21+
- {os: macos-latest, r: 'release'}
2422

2523
- {os: windows-latest, r: 'release'}
2624
# Use 3.6 to trigger usage of RTools35
2725
- {os: windows-latest, r: '3.6'}
26+
# use 4.1 to check with rtools40's older compiler
27+
- {os: windows-latest, r: '4.1'}
2828

29-
# Use older ubuntu to maximise backward compatibility
30-
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
31-
- {os: ubuntu-latest, r: 'release'}
32-
- {os: ubuntu-latest, r: 'oldrel-1'}
33-
- {os: ubuntu-latest, r: 'oldrel-2'}
34-
- {os: ubuntu-latest, r: 'oldrel-3'}
35-
- {os: ubuntu-latest, r: 'oldrel-4'}
29+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
30+
- {os: ubuntu-latest, r: 'release'}
31+
- {os: ubuntu-latest, r: 'oldrel-1'}
32+
- {os: ubuntu-latest, r: 'oldrel-2'}
33+
- {os: ubuntu-latest, r: 'oldrel-3'}
34+
- {os: ubuntu-latest, r: 'oldrel-4'}
3635

3736
env:
3837
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3938
R_KEEP_PKG_SOURCE: yes
4039

4140
steps:
42-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v3
4342

4443
- uses: r-lib/actions/setup-pandoc@v2
4544

@@ -56,10 +55,7 @@ jobs:
5655

5756
- uses: r-lib/actions/check-r-package@v2
5857
with:
58+
upload-snapshots: true
5959
error-on: '"note"'
6060
env:
6161
_R_CHECK_FORCE_SUGGESTS_: false
62-
63-
concurrency:
64-
group: ${{ github.workflow }}-${{ github.head_ref }}
65-
cancel-in-progress: true

.github/workflows/pkgdown.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3
2424

2525
- uses: r-lib/actions/setup-pandoc@v2
2626

@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Deploy to GitHub pages 🚀
4141
if: github.event_name != 'pull_request'
42-
uses: JamesIves/[email protected].4
42+
uses: JamesIves/github-pages-deploy-action@v4.4.1
4343
with:
4444
clean: false
4545
branch: gh-pages
Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,31 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
13
on:
24
push:
3-
branches:
4-
- main
5+
branches: [main, master]
56
pull_request:
6-
branches:
7-
- main
7+
branches: [main, master]
88

99
name: test-coverage
1010

1111
jobs:
1212
test-coverage:
13-
runs-on: macOS-latest
13+
runs-on: ubuntu-latest
1414
env:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
16-
steps:
17-
- uses: actions/checkout@v2
18-
19-
- uses: r-lib/actions/setup-r@master
2016

21-
- uses: r-lib/actions/setup-pandoc@master
22-
23-
- name: Query dependencies
24-
run: |
25-
install.packages('remotes')
26-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
27-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
28-
shell: Rscript {0}
17+
steps:
18+
- uses: actions/checkout@v3
2919

30-
- name: Cache R packages
31-
uses: actions/cache@v1
20+
- uses: r-lib/actions/setup-r@v2
3221
with:
33-
path: ${{ env.R_LIBS_USER }}
34-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
35-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
22+
use-public-rspm: true
3623

37-
- name: Install dependencies
38-
run: |
39-
install.packages(c("remotes"))
40-
remotes::install_deps(dependencies = TRUE)
41-
remotes::install_cran("covr")
42-
shell: Rscript {0}
24+
- uses: r-lib/actions/setup-r-dependencies@v2
25+
with:
26+
extra-packages: any::covr
27+
needs: coverage
4328

4429
- name: Test coverage
45-
run: covr::codecov()
30+
run: covr::codecov(quiet = FALSE)
4631
shell: Rscript {0}
47-
48-
concurrency:
49-
group: ${{ github.workflow }}-${{ github.head_ref }}
50-
cancel-in-progress: true

0 commit comments

Comments
 (0)