Skip to content

Commit e25b33f

Browse files
committed
Update pkgdown to latest setup from usethis
1 parent 7a8ca21 commit e25b33f

5 files changed

Lines changed: 18 additions & 13 deletions

File tree

.Rbuildignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ dev/*
88
^.*\.Rproj$
99
^\.Rproj\.user$
1010
^\.github$
11+
^_pkgdown\.yml$
12+
^docs$
13+
^pkgdown$

.github/workflows/pkgdown.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
push:
55
branches: [main, master]
66
pull_request:
7-
branches: [main, master]
87
release:
98
types: [published]
109
workflow_dispatch:
1110

12-
name: pkgdown
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
1314

1415
jobs:
1516
pkgdown:
@@ -19,6 +20,8 @@ jobs:
1920
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
2021
env:
2122
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents: write
2225
steps:
2326
- uses: actions/checkout@v4
2427

@@ -28,25 +31,20 @@ jobs:
2831
with:
2932
use-public-rspm: true
3033
extra-repositories: https://mrc-ide.r-universe.dev
34+
3135
- uses: r-lib/actions/setup-r-dependencies@v2
3236
with:
33-
extra-packages: any::pkgdown, any::here
37+
extra-packages: any::pkgdown, local::.
3438
needs: website
3539

36-
# This as a separate step as we need dependencies to be resolved
37-
# otherwise this is erroring when running the configure script
38-
- name: Install frogger
39-
uses: r-lib/actions/setup-r-dependencies@v2
40-
with:
41-
packages: local::.
42-
4340
- name: Build site
4441
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
4542
shell: Rscript {0}
4643

4744
- name: Deploy to GitHub pages 🚀
4845
if: github.event_name != 'pull_request'
49-
uses: JamesIves/github-pages-deploy-action@v4.4.1
46+
uses: JamesIves/github-pages-deploy-action@v4.5.0
5047
with:
5148
clean: false
5249
branch: gh-pages
50+
folder: docs

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ dev/*
1111
inst/doc
1212
vignettes_src/eppasm-spectrum-workflow_cache/
1313
vignettes_src/
14-
docs/
14+
docs

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ Suggests:
2828
knitr,
2929
rmarkdown
3030
VignetteBuilder: knitr
31-
URL: https://github.com/mrc-ide/eppasm
31+
URL: https://github.com/mrc-ide/eppasm, https://mrc-ide.github.io/eppasm/
3232
BugReports: https://github.com/mrc-ide/eppasm/issues
3333
RoxygenNote: 7.2.3

_pkgdown.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
url: https://mrc-ide.github.io/eppasm/
2+
template:
3+
bootstrap: 5
4+

0 commit comments

Comments
 (0)