Skip to content

Commit

Permalink
[setup-r] Do not install qpdf on Windows
Browse files Browse the repository at this point in the history
It is already in rtools. #474
  • Loading branch information
gaborcsardi committed Jan 11, 2022
1 parent 9eb2437 commit 692601f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ Authors@R:
email = "james.hester@rstudio.com"))
Description: This is a simple package used to test the workflow files.
Imports: xml2, curl
Suggests: covr
Suggests: covr, knitr, rmarkdown
License: GPL (>= 2)
VignetteBuilder: knitr, rmarkdown
3 changes: 1 addition & 2 deletions setup-r/lib/installer.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ function acquireR(version, rtoolsVersion) {
if (IS_WINDOWS) {
yield Promise.all([
yield acquireRWindows(version),
yield acquireRtools(rtoolsVersion),
yield acquireQpdfWindows()
yield acquireRtools(rtoolsVersion)
]);
}
else if (IS_MAC) {
Expand Down
1 change: 0 additions & 1 deletion setup-r/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ async function acquireR(version: string, rtoolsVersion: string) {
await Promise.all([
await acquireRWindows(version),
await acquireRtools(rtoolsVersion),
await acquireQpdfWindows()
]);
} else if (IS_MAC) {
await core.group('Downloading gfortran', async() => { await acquireFortranMacOS() });
Expand Down
22 changes: 22 additions & 0 deletions vignettes/test.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
title: "Test vignette for GH Actions"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Test vignette for GH Actopns}
%\VignetteEngine{knitr::rmarkdown}
%\VignetteEncoding{UTF-8}
---

```{r, include = FALSE}
knitr::opts_chunk$set(
collapse = TRUE,
comment = "#>"
)
```

Irure ad excepteur aliqua esse id sint ex aliquip laborum. Officia laborum ex cupidatat exercitation velit. Nisi elit incididunt nisi ullamco. Ut Lorem eiusmod anim ipsum dolore cupidatat officia non. Culpa voluptate consectetur in ullamco minim sit sunt. Ad aute laborum laborum cillum qui consequat proident sit ad incididunt. Enim nisi nulla aliquip anim fugiat deserunt aliqua aliqua sunt nisi commodo magna reprehenderit. Reprehenderit dolor sunt nulla mollit est magna exercitation dolore magna. Mollit qui labore tempor commodo veniam cupidatat esse irure nisi eiusmod qui dolore nisi.

```{r}
summary(mtcars)
```

0 comments on commit 692601f

Please sign in to comment.