Skip to content
This repository was archived by the owner on Jun 14, 2023. It is now read-only.

Commit 8f80d29

Browse files
committed
Update GitHub Actions with usethis 2.1.6
1 parent fdb996a commit 8f80d29

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

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

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# 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
33
on:
44
push:
@@ -31,28 +31,19 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v2
3333

34-
- uses: r-lib/actions/setup-pandoc@v1
34+
- uses: r-lib/actions/setup-pandoc@v2
3535

36-
- uses: r-lib/actions/setup-r@v1
36+
- uses: r-lib/actions/setup-r@v2
3737
with:
3838
r-version: ${{ matrix.config.r }}
3939
http-user-agent: ${{ matrix.config.http-user-agent }}
4040
use-public-rspm: true
4141

42-
- uses: r-lib/actions/setup-r-dependencies@v1
42+
- uses: r-lib/actions/setup-r-dependencies@v2
4343
with:
44-
extra-packages: rcmdcheck
44+
extra-packages: any::rcmdcheck
45+
needs: check
4546

46-
- uses: r-lib/actions/check-r-package@v1
47-
48-
- name: Show testthat output
49-
if: always()
50-
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
51-
shell: bash
52-
53-
- name: Upload check results
54-
if: failure()
55-
uses: actions/upload-artifact@main
47+
- uses: r-lib/actions/check-r-package@v2
5648
with:
57-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
58-
path: check
49+
upload-snapshots: true

.github/workflows/pkgdown.yaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,46 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# 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
33
on:
44
push:
55
branches: [main, master]
6-
tags: ['*']
6+
pull_request:
7+
branches: [main, master]
8+
release:
9+
types: [published]
10+
workflow_dispatch:
711

812
name: pkgdown
913

1014
jobs:
1115
pkgdown:
1216
runs-on: ubuntu-latest
17+
# Only restrict concurrency for non-PR jobs
18+
concurrency:
19+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
1320
env:
1421
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1522
steps:
1623
- uses: actions/checkout@v2
1724

18-
- uses: r-lib/actions/setup-pandoc@v1
25+
- uses: r-lib/actions/setup-pandoc@v2
1926

20-
- uses: r-lib/actions/setup-r@v1
27+
- uses: r-lib/actions/setup-r@v2
2128
with:
2229
use-public-rspm: true
2330

24-
- uses: r-lib/actions/setup-r-dependencies@v1
31+
- uses: r-lib/actions/setup-r-dependencies@v2
2532
with:
26-
extra-packages: pkgdown
33+
extra-packages: any::pkgdown, local::.
2734
needs: website
2835

29-
- name: Deploy package
30-
run: |
31-
git config --local user.name "$GITHUB_ACTOR"
32-
git config --local user.email "[email protected]"
33-
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
36+
- name: Build site
37+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
38+
shell: Rscript {0}
39+
40+
- name: Deploy to GitHub pages 🚀
41+
if: github.event_name != 'pull_request'
42+
uses: JamesIves/[email protected]
43+
with:
44+
clean: false
45+
branch: gh-pages
46+
folder: docs

.github/workflows/test-coverage.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# 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
33
on:
44
push:
@@ -17,14 +17,15 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: r-lib/actions/setup-r@v1
20+
- uses: r-lib/actions/setup-r@v2
2121
with:
2222
use-public-rspm: true
2323

24-
- uses: r-lib/actions/setup-r-dependencies@v1
24+
- uses: r-lib/actions/setup-r-dependencies@v2
2525
with:
26-
extra-packages: covr
26+
extra-packages: any::covr
27+
needs: coverage
2728

2829
- name: Test coverage
29-
run: covr::codecov()
30+
run: covr::codecov(quiet = FALSE)
3031
shell: Rscript {0}

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ knitr::opts_chunk$set(
1616
# gsdmvn
1717

1818
<!-- badges: start -->
19-
[![R-CMD-check](https://github.com/Merck/gsdmvn/workflows/R-CMD-check/badge.svg)](https://github.com/Merck/gsdmvn/actions)
19+
[![R-CMD-check](https://github.com/Merck/gsdmvn/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/Merck/gsdmvn/actions/workflows/R-CMD-check.yaml)
2020
[![Codecov test coverage](https://codecov.io/gh/Merck/gsdmvn/branch/main/graph/badge.svg)](https://app.codecov.io/gh/Merck/gsdmvn?branch=main)
2121
<!-- badges: end -->
2222

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<!-- badges: start -->
77

8-
[![R-CMD-check](https://github.com/Merck/gsdmvn/workflows/R-CMD-check/badge.svg)](https://github.com/Merck/gsdmvn/actions)
8+
[![R-CMD-check](https://github.com/Merck/gsdmvn/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/Merck/gsdmvn/actions/workflows/R-CMD-check.yaml)
99
[![Codecov test coverage](https://codecov.io/gh/Merck/gsdmvn/branch/main/graph/badge.svg)](https://app.codecov.io/gh/Merck/gsdmvn?branch=main)
1010
<!-- badges: end -->
1111

0 commit comments

Comments
 (0)