Skip to content

Commit a509f03

Browse files
authored
Merge pull request #269 from cmu-delphi/lcb/repair-github-actions
Update GitHub Actions themselves, not just embedded dependencies
2 parents 4202958 + a4abd68 commit a509f03

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

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

+3-3
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:
@@ -15,12 +15,12 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616
R_KEEP_PKG_SOURCE: yes
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919

2020
- uses: r-lib/actions/setup-r@v2
2121
with:
2222
use-public-rspm: true
23-
23+
2424
- uses: r-lib/actions/setup-r-dependencies@v2
2525
with:
2626
extra-packages: any::rcmdcheck

.github/workflows/pkgdown.yaml

+19-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
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+
pull_request:
7+
branches: [main, master]
68
release:
79
types: [published]
810
workflow_dispatch:
@@ -12,10 +14,13 @@ name: pkgdown
1214
jobs:
1315
pkgdown:
1416
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 }}
1520
env:
1621
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1722
steps:
18-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v3
1924

2025
- uses: r-lib/actions/setup-pandoc@v2
2126

@@ -25,11 +30,17 @@ jobs:
2530

2631
- uses: r-lib/actions/setup-r-dependencies@v2
2732
with:
28-
extra-packages: pkgdown
33+
extra-packages: any::pkgdown, local::.
2934
needs: website
3035

31-
- name: Deploy package
32-
run: |
33-
git config --local user.name "$GITHUB_ACTOR"
34-
git config --local user.email "[email protected]"
35-
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

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# epiprocess
22

33
<!-- badges: start -->
4-
[![R-CMD-check](https://github.com/cmu-delphi/epiprocess/workflows/R-CMD-check/badge.svg)](https://github.com/cmu-delphi/epiprocess/actions)
4+
[![R-CMD-check](https://github.com/cmu-delphi/epiprocess/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/cmu-delphi/epiprocess/actions/workflows/R-CMD-check.yaml)
55
<!-- badges: end -->
66

77
This package introduces a common data structure for epidemiological data sets

0 commit comments

Comments
 (0)