Skip to content

Commit ad9a7d4

Browse files
committed
Merged origin/main into quarto-path
2 parents 099082a + e72358a commit ad9a7d4

6 files changed

Lines changed: 19 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
- uses: r-lib/actions/setup-pandoc@v2
4747

4848
- uses: r-lib/actions/setup-tinytex@v2
49+
env:
50+
TINYTEX_INSTALLER: TinyTeX
4951

5052
- uses: r-lib/actions/setup-r@v2
5153
with:
@@ -59,6 +61,8 @@ jobs:
5961
needs: check
6062

6163
- uses: r-lib/actions/check-r-package@v2
64+
env:
65+
R_QUARTO_QUIET: false
6266
with:
6367
upload-snapshots: true
6468
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/no-pandoc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ jobs:
2727
needs: check
2828

2929
- uses: r-lib/actions/setup-tinytex@v2
30+
env:
31+
TINYTEX_INSTALLER: TinyTeX
3032

3133
- run: sudo apt-get --purge remove pandoc
3234
- run: rm -rf vignettes
3335

3436
- uses: r-lib/actions/check-r-package@v2
37+
env:
38+
R_QUARTO_QUIET: false

.github/workflows/test-coverage.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
needs: coverage
3131

3232
- uses: r-lib/actions/setup-tinytex@v2
33+
env:
34+
TINYTEX_INSTALLER: TinyTeX
3335

3436
- name: Test coverage
3537
run: |

DESCRIPTION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,5 @@ Encoding: UTF-8
7777
Roxygen: list(markdown = TRUE)
7878
RoxygenNote: 7.3.3
7979
SystemRequirements: pandoc
80+
Remotes:
81+
quarto=quarto-dev/quarto-r

R/build-article.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ wrap_rmarkdown_error <- function(cnd, input, call = caller_env()) {
290290
cli::cli_abort(
291291
c(
292292
"!" = "Failed to render {.path {input}}.",
293-
set_names(lines, "x")
293+
set_names(cli_escape(lines), "x")
294294
),
295295
parent = cnd$parent %||% cnd,
296296
trace = cnd$parent$trace,

R/utils.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,3 +227,9 @@ print.pkgdown_xml <- function(x, ...) {
227227
cat(as.character(x, options = c("format", "no_declaration")), sep = "\n")
228228
invisible(x)
229229
}
230+
231+
cli_escape <- function(x) {
232+
x <- gsub("{", "{{", x, fixed = TRUE)
233+
x <- gsub("}", "}}", x, fixed = TRUE)
234+
x
235+
}

0 commit comments

Comments
 (0)