Skip to content

Commit

Permalink
Merge pull request #9 from SebKrantz/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
SebKrantz authored Dec 25, 2024
2 parents b0850c7 + fc6180b commit ba8f7a0
Show file tree
Hide file tree
Showing 112 changed files with 1,106 additions and 1,075 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@
^tools$
^\.lintr.R$
^vignettes/\.quarto$
^vignettes/articles/\.quarto$
^vignettes/articles/*_files$
^vignettes/articles$
16 changes: 6 additions & 10 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
pull_request:
branches: [main, master]

name: R-CMD-check
name: R-CMD-check.yaml

permissions: read-all

Expand All @@ -27,8 +27,8 @@ jobs:
- {os: macos-latest, r: 'release'}

- {os: windows-latest, r: 'release'}
# use 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: '4.1'}
# use 4.0 or 4.1 to check with rtools40's older compiler
- {os: windows-latest, r: 'oldrel-4'}

- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
Expand All @@ -44,15 +44,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: quarto-dev/quarto-actions/setup@v2
with:
version: pre-release
tinytex: true
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

- uses: r-lib/actions/setup-tinytex@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
Expand All @@ -63,6 +58,7 @@ jobs:
with:
extra-packages: any::rcmdcheck
needs: check
quarto-version: 1.6.32

- uses: r-lib/actions/check-r-package@v2
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ jobs:
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::lintr, local::.
needs: lint

- uses: r-lib/actions/setup-tinytex@v2

- name: Lint
run: lintr::lint_package()
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/netlify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ jobs:

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

- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown
name: pkgdown.yaml

permissions: read-all

Expand All @@ -24,13 +26,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: quarto-dev/quarto-actions/setup@v2
with:
version: pre-release
tinytex: true
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

- uses: r-lib/actions/setup-r@v2
Expand All @@ -41,6 +36,8 @@ jobs:
with:
extra-packages: any::pkgdown, local::.
needs: website

- uses: r-lib/actions/setup-tinytex@v2

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
issue_comment:
types: [created]

name: Commands
name: pr-commands.yaml

permissions: read-all

Expand All @@ -15,6 +15,8 @@ jobs:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -52,6 +54,8 @@ jobs:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
branches: [main, master]

name: test-coverage
name: test-coverage.yaml

permissions: read-all

Expand All @@ -21,13 +21,6 @@ jobs:

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

- uses: quarto-dev/quarto-actions/setup@v2
with:
version: pre-release
tinytex: true
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
Expand All @@ -36,6 +29,9 @@ jobs:
with:
extra-packages: any::covr, any::xml2
needs: coverage
quarto-version: 1.6.32

- uses: r-lib/actions/setup-tinytex@v2

- name: Test coverage
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ inst/doc
docs

/.quarto/
**/.quarto/
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: pkgdown
Title: Make Static HTML Documentation for a Package
Version: 2.0.9.9000
Version: 2.1.1.9000
Authors@R: c(
person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-4757-117X")),
Expand All @@ -21,7 +21,7 @@ License: MIT + file LICENSE
URL: https://pkgdown.r-lib.org/, https://github.com/r-lib/pkgdown
BugReports: https://github.com/r-lib/pkgdown/issues
Depends:
R (>= 3.6)
R (>= 4.0.0)
Imports:
bslib (>= 0.5.1),
callr (>= 3.7.3),
Expand All @@ -31,12 +31,12 @@ Imports:
downlit (>= 0.4.4),
fontawesome,
fs (>= 1.4.0),
httr2 (>= 1.0.0),
httr2 (>= 1.0.2),
jsonlite,
openssl,
purrr (>= 1.0.0),
ragg,
rlang (>= 1.1.0),
rlang (>= 1.1.4),
rmarkdown (>= 2.27),
tibble,
whisker,
Expand Down Expand Up @@ -73,5 +73,5 @@ Config/testthat/parallel: true
Config/testthat/start-first: build-article, build-quarto-article, build-reference
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
SystemRequirements: pandoc
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export(build_site)
export(build_site_github_pages)
export(build_tutorials)
export(check_pkgdown)
export(clean_cache)
export(clean_site)
export(data_template)
export(deploy_site_github)
Expand Down
Loading

0 comments on commit ba8f7a0

Please sign in to comment.