Skip to content

Commit 46a9d8b

Browse files
jimhesterjimhester
committed
Update to latest action workflows
1 parent 59218b7 commit 46a9d8b

4 files changed

Lines changed: 100 additions & 67 deletions

File tree

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

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
# NOTE: This workflow is overkill for most R packages
2+
# check-standard.yaml is likely a better choice
3+
# usethis::use_github_action("check-standard") will install it.
4+
#
5+
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
6+
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
17
on:
28
push:
39
branches:
10+
- main
411
- master
512
pull_request:
613
branches:
14+
- main
715
- master
816

917
name: R-CMD-check
@@ -21,54 +29,54 @@ jobs:
2129
- {os: macOS-latest, r: 'release'}
2230
- {os: windows-latest, r: 'release'}
2331
- {os: windows-latest, r: '3.6'}
24-
- {os: ubuntu-16.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
25-
- {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
26-
- {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
27-
- {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
28-
- {os: ubuntu-16.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
29-
- {os: ubuntu-16.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/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" }
33+
- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
34+
- {os: ubuntu-18.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
35+
- {os: ubuntu-18.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
36+
- {os: ubuntu-18.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
37+
- {os: ubuntu-18.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3038

3139
env:
32-
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3340
RSPM: ${{ matrix.config.rspm }}
3441
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3542

3643
steps:
3744
- uses: actions/checkout@v2
3845

39-
- uses: r-lib/actions/setup-r@master
46+
- uses: r-lib/actions/setup-r@v1
47+
id: install-r
4048
with:
4149
r-version: ${{ matrix.config.r }}
50+
http-user-agent: ${{ matrix.config.http-user-agent }}
4251

43-
- uses: r-lib/actions/setup-pandoc@master
52+
- uses: r-lib/actions/setup-pandoc@v1
4453

45-
- name: Query dependencies
54+
- name: Install pak and query dependencies
4655
run: |
47-
install.packages('remotes')
48-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
49-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
56+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
57+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
5058
shell: Rscript {0}
5159

52-
- name: Cache R packages
53-
if: runner.os != 'Windows'
54-
uses: actions/cache@v1
60+
- name: Restore R package cache
61+
uses: actions/cache@v2
5562
with:
56-
path: ${{ env.R_LIBS_USER }}
57-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
58-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
63+
path: |
64+
${{ env.R_LIBS_USER }}
65+
!${{ env.R_LIBS_USER }}/pak
66+
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
67+
restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
5968

6069
- name: Install system dependencies
6170
if: runner.os == 'Linux'
6271
run: |
63-
while read -r cmd
64-
do
65-
eval sudo $cmd
66-
done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "16.04"), sep = "\n")')
72+
pak::local_system_requirements(execute = TRUE)
73+
pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
74+
shell: Rscript {0}
6775

6876
- name: Install dependencies
6977
run: |
70-
remotes::install_deps(dependencies = TRUE)
71-
remotes::install_cran("rcmdcheck")
78+
pak::local_install_dev_deps(upgrade = TRUE)
79+
pak::pkg_install("rcmdcheck")
7280
shell: Rscript {0}
7381

7482
- name: Session info
@@ -81,7 +89,9 @@ jobs:
8189
- name: Check
8290
env:
8391
_R_CHECK_CRAN_INCOMING_: false
84-
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
92+
run: |
93+
options(crayon.enabled = TRUE)
94+
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
8595
shell: Rscript {0}
8696

8797
- name: Show testthat output
@@ -93,5 +103,5 @@ jobs:
93103
if: failure()
94104
uses: actions/upload-artifact@main
95105
with:
96-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
106+
name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results
97107
path: check

‎.github/workflows/pkgdown.yaml‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,59 @@
11
on:
22
push:
3-
branches: master
3+
branches:
4+
- main
5+
- master
46

57
name: pkgdown
68

79
jobs:
810
pkgdown:
9-
runs-on: macOS-latest
11+
runs-on: ubuntu-18.04
1012
env:
13+
RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
1114
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
15+
1216
steps:
1317
- uses: actions/checkout@v2
1418

15-
- uses: r-lib/actions/setup-r@master
19+
- uses: r-lib/actions/setup-r@v1
20+
id: install-r
1621

17-
- uses: r-lib/actions/setup-pandoc@master
22+
- uses: r-lib/actions/setup-pandoc@v1
1823

19-
- name: Query dependencies
24+
- name: Install pak and query dependencies
2025
run: |
21-
install.packages('remotes')
22-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
23-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
26+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
27+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
2428
shell: Rscript {0}
2529

26-
- name: Cache R packages
27-
uses: actions/cache@v1
30+
- name: Restore R package cache
31+
uses: actions/cache@v2
2832
with:
29-
path: ${{ env.R_LIBS_USER }}
30-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
31-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
33+
path: |
34+
${{ env.R_LIBS_USER }}
35+
!${{ env.R_LIBS_USER }}/pak
36+
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
37+
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-
38+
39+
- name: Install system dependencies
40+
if: runner.os == 'Linux'
41+
run: |
42+
pak::local_system_requirements(execute = TRUE)
43+
pak::pkg_system_requirements("pkgdown", execute = TRUE)
44+
shell: Rscript {0}
3245

3346
- name: Install dependencies
3447
run: |
35-
remotes::install_deps(dependencies = TRUE)
36-
install.packages("pkgdown")
48+
pak::local_install_dev_deps(upgrade = TRUE)
49+
pak::pkg_install("pkgdown")
3750
shell: Rscript {0}
3851

3952
- name: Install package
4053
run: R CMD INSTALL .
4154

42-
- name: Deploy package
55+
- name: Build and deploy pkgdown site
4356
run: |
44-
git config --local user.email "actions@github.com"
45-
git config --local user.name "GitHub Actions"
57+
git config --local user.name "$GITHUB_ACTOR"
58+
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
4659
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

‎.github/workflows/pr-commands.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: r-lib/actions/pr-fetch@master
14+
- uses: r-lib/actions/pr-fetch@v1
1515
with:
1616
repo-token: ${{ secrets.GITHUB_TOKEN }}
17-
- uses: r-lib/actions/setup-r@master
17+
- uses: r-lib/actions/setup-r@v1
1818
- name: Install dependencies
1919
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
2020
- name: Document
@@ -25,7 +25,7 @@ jobs:
2525
git config --local user.name "GitHub Actions"
2626
git add man/\* NAMESPACE
2727
git commit -m 'Document'
28-
- uses: r-lib/actions/pr-push@master
28+
- uses: r-lib/actions/pr-push@v1
2929
with:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
style:
@@ -36,10 +36,10 @@ jobs:
3636
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3737
steps:
3838
- uses: actions/checkout@v2
39-
- uses: r-lib/actions/pr-fetch@master
39+
- uses: r-lib/actions/pr-fetch@v1
4040
with:
4141
repo-token: ${{ secrets.GITHUB_TOKEN }}
42-
- uses: r-lib/actions/setup-r@master
42+
- uses: r-lib/actions/setup-r@v1
4343
- name: Install dependencies
4444
run: Rscript -e 'install.packages("styler")'
4545
- name: Style
@@ -50,6 +50,6 @@ jobs:
5050
git config --local user.name "GitHub Actions"
5151
git add \*.R
5252
git commit -m 'Style'
53-
- uses: r-lib/actions/pr-push@master
53+
- uses: r-lib/actions/pr-push@v1
5454
with:
5555
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test-coverage.yaml‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,54 @@
11
on:
22
push:
33
branches:
4+
- main
45
- master
56
pull_request:
67
branches:
8+
- main
79
- master
810

911
name: test-coverage
1012

1113
jobs:
1214
test-coverage:
13-
runs-on: macOS-latest
15+
runs-on: ubuntu-18.04
1416
env:
17+
RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
1518
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
19+
1620
steps:
1721
- uses: actions/checkout@v2
1822

19-
- uses: r-lib/actions/setup-r@master
20-
21-
- uses: r-lib/actions/setup-pandoc@master
23+
- uses: r-lib/actions/setup-r@v1
24+
id: install-r
2225

23-
- name: Query dependencies
26+
- name: Install pak and query dependencies
2427
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+
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
29+
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
2830
shell: Rscript {0}
2931

30-
- name: Cache R packages
31-
uses: actions/cache@v1
32+
- name: Restore R package cache
33+
uses: actions/cache@v2
3234
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-
35+
path: |
36+
${{ env.R_LIBS_USER }}
37+
!${{ env.R_LIBS_USER }}/pak
38+
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
39+
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-
40+
41+
- name: Install system dependencies
42+
if: runner.os == 'Linux'
43+
run: |
44+
pak::local_system_requirements(execute = TRUE)
45+
pak::pkg_system_requirements("covr", execute = TRUE)
46+
shell: Rscript {0}
3647

3748
- name: Install dependencies
3849
run: |
39-
install.packages(c("remotes"))
40-
remotes::install_deps(dependencies = TRUE)
41-
remotes::install_cran("covr")
50+
pak::local_install_dev_deps(upgrade = TRUE)
51+
pak::pkg_install("covr")
4252
shell: Rscript {0}
4353

4454
- name: Test coverage

0 commit comments

Comments
 (0)