Skip to content

Commit a229171

Browse files
author
‘topepo’
committed
Merge remote-tracking branch 'upstream/main'
2 parents 4066f0e + 7aef557 commit a229171

File tree

10 files changed

+37
-17
lines changed

10 files changed

+37
-17
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
# check-standard.yaml is likely a better choice.
66
# usethis::use_github_action("check-standard") will install it.
77
on:
8+
workflow_dispatch:
89
push:
910
branches: [main, master]
1011
pull_request:
1112
branches: [main, master]
1213

1314
name: R-CMD-check
1415

16+
permissions: read-all
17+
1518
jobs:
1619
R-CMD-check:
1720
runs-on: ${{ matrix.config.os }}
@@ -27,8 +30,6 @@ jobs:
2730

2831
- {os: windows-latest, r: 'release'}
2932
- {os: windows-latest, r: 'release', quarto: 'pre-release'}
30-
# Use 3.6 to trigger usage of RTools35
31-
- {os: windows-latest, r: '3.6'}
3233
# use 4.1 to check with rtools40's older compiler
3334
- {os: windows-latest, r: '4.1'}
3435

@@ -48,6 +49,8 @@ jobs:
4849
- uses: actions/checkout@v4
4950

5051
- uses: quarto-dev/quarto-actions/setup@v2
52+
env:
53+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5154
with:
5255
version: ${{ matrix.config.quarto || 'release' }}
5356
tinytex: true
@@ -71,3 +74,4 @@ jobs:
7174
- uses: r-lib/actions/check-r-package@v2
7275
with:
7376
upload-snapshots: true
77+
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/pkgdown.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111

1212
name: pkgdown
1313

14+
permissions: read-all
15+
1416
jobs:
1517
pkgdown:
1618
runs-on: ubuntu-latest

.github/workflows/pr-commands.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66

77
name: Commands
88

9+
permissions: read-all
10+
911
jobs:
1012
document:
1113
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}

.github/workflows/test-coverage.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
name: test-coverage
1010

11+
permissions: read-all
12+
1113
jobs:
1214
test-coverage:
1315
runs-on: ubuntu-latest
@@ -28,23 +30,32 @@ jobs:
2830

2931
- uses: r-lib/actions/setup-r-dependencies@v2
3032
with:
31-
extra-packages: any::covr
33+
extra-packages: any::covr, any::xml2
3234
needs: coverage
3335

3436
- name: Test coverage
3537
run: |
36-
covr::codecov(
38+
cov <- covr::package_coverage(
3739
quiet = FALSE,
3840
clean = FALSE,
3941
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
4042
)
43+
covr::to_cobertura(cov)
4144
shell: Rscript {0}
4245

46+
- uses: codecov/codecov-action@v4
47+
with:
48+
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
49+
file: ./cobertura.xml
50+
plugin: noop
51+
disable_search: true
52+
token: ${{ secrets.CODECOV_TOKEN }}
53+
4354
- name: Show testthat output
4455
if: always()
4556
run: |
4657
## --------------------------------------------------------------------
47-
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
58+
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
4859
shell: bash
4960

5061
- name: Upload test results

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ VignetteBuilder:
4141
Config/testthat/edition: 3
4242
Encoding: UTF-8
4343
Roxygen: list(markdown = TRUE)
44-
RoxygenNote: 7.3.1
44+
RoxygenNote: 7.3.2
4545
SystemRequirements: Quarto command line tools
4646
(https://github.com/quarto-dev/quarto-cli).

R/render.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#'
77
#' @param input The input file or project directory to be rendered (defaults
88
#' to rendering the project in the current working directory).
9-
#' @param output_format Target output format (defaults to "html"). The option
9+
#' @param output_format Target output format (defaults to `"html"`). The option
1010
#' `"all"` will render all formats defined within the file or project.
1111
#' @param output_file The name of the output file. If using `NULL`, the output
1212
#' filename will be based on the filename for the input file. `output_file` is
@@ -46,7 +46,7 @@
4646
#' advanced usage and useful for CLI arguments which are not yet mirrored in a
4747
#' dedicated parameter of this \R function. See `quarto render --help` for options.
4848
#' @param pandoc_args Additional command line arguments to pass on to Pandoc.
49-
#' @param as_job Render as an RStudio background job. Default is "auto",
49+
#' @param as_job Render as an RStudio background job. Default is `"auto"`,
5050
#' which will render individual documents normally and projects as
5151
#' background jobs. Use the `quarto.render_as_job` \R option to control
5252
#' the default globally.

R/run.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#'
33
#' Serve a Shiny interactive document. By default, the document will
44
#' be rendered first and then served If you have previously rendered
5-
#' the document, pass `render - FALSE` to skip rendering.
5+
#' the document, pass `render = FALSE` to skip rendering.
66
#'
7-
#' @param input The input file to run Should be a file with
7+
#' @param input The input file to run. Should be a file with
88
#' a `server: shiny` entry in its YAML front-matter.
99
#' @param render Render the document before serving it.
1010
#'

man/quarto_render.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/quarto_serve.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/hello.qmd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,22 @@ format:
4242
css: custom.css
4343
```
4444
45-
All those configurations are set in way that they can't be override by YAML header in the vignette source file. Only new configuration can be set, e.g adding a Table Of Content:
45+
All those configurations are set in way that they can't be overriden by the YAML header in the vignette source file and only new configurations can be set. Typical examples for such configurations are adding a [table of contents](https://quarto.org/docs/reference/formats/html.html#table-of-contents) or enabling the rendering of mathematical notation in the [format options](https://quarto.org/docs/reference/formats/html.html#format-options), e.g., by MathJax. Specifically, these two options can be set in the following way:
4646
4747
````yaml
4848
format:
4949
html:
5050
toc: true
51+
html-math-method: mathjax
5152
vignette: >
5253
%\VignetteIndexEntry{Vignette's Title}
5354
%\VignetteEngine{quarto::html}
5455
%\VignetteEncoding{UTF-8}
5556
````
5657
57-
This is one limitation of the current implementation of the vignette engine. This is to insure HTML vignette produced are reasonable in size and can be published on CRAN without problem.
58+
The minimal default format is a deliberate limitation of the current implementation of the vignette engine. It ensures that the HTML vignettes produced are reasonable in size and can be published on CRAN without problems.
5859
59-
The other limitation concerns the interactive rendering. If you render your vignette `.qmd` file using `quarto render` or any other function, the output will be based on default HTML format from Quarto and not the vignette engine one. Only building the vignette will produce the real results. More about building vignette in the [R Packages (2e)](https://r-pkgs.org/vignettes.html#sec-vignettes-how-built-checked) book.
60+
Another limitation concerns the interactive rendering. If you render your vignette `.qmd` file using `quarto render` or any other function, the output will be based on the default HTML format from Quarto and not the vignette engine one. Only building the vignette will produce the real results. More details about building vignettes are available in the [R Packages (2e)](https://r-pkgs.org/vignettes.html#sec-vignettes-how-built-checked) book.
6061

6162
Intermediates resources that would be created by an authoring workflow that would `quarto render` with default `format: html` should be ignored in package sources.
6263

0 commit comments

Comments
 (0)