Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: r-lib/actions
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.9.0
Choose a base ref
...
head repository: r-lib/actions
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.10.0
Choose a head ref
  • 16 commits
  • 45 files changed
  • 4 contributors

Commits on May 9, 2024

  1. Empty commit to trigger workflows

    gaborcsardi committed May 9, 2024
    Copy the full SHA
    f02b30a View commit details
  2. GHA scorecard: add token

    gaborcsardi committed May 9, 2024
    Copy the full SHA
    fbafc3b View commit details

Commits on Jul 29, 2024

  1. [setup-r]: use a P3M snapshot by default on R 3.6.x (#879)

    * [setup-r]: use a P3M snapshot by default on R 3.6.x
    
    See NEWS for details.
    
    * Avoid dot in env var name, NEWS wording
    
    * Use `2024-05-25` for R 3.6. PPM snapshot
    
    Cf. #879 (comment)
    gaborcsardi authored Jul 29, 2024
    Copy the full SHA
    f4937e0 View commit details

Commits on Aug 2, 2024

  1. [setup-r-dependencies] Allow skipping pak install step (#887)

    * [setup-r-dependencies] Allow skipping pak install step
    
    Specify: pak-version: none
    
    * [setup-r-dependencies]: cache ignore _cache directory in lib
    
    Fails in container, and not needed.
    
    * NEWS for pak-version: none
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    c899797 View commit details
  2. [setup-r]: try to unlink brew R silently (#891)

    * [setup-r]: try to unlink brew R silently
    
    To avoid #864.
    
    * [setup-r]: run brew install silently
    
    brew likes to warn about already installed packages
    and env vars, but we don't care about these.
    
    * NEWS for avoiding brew warnings
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    732fb28 View commit details
  3. [setup-r-dependencies]: install quarto if needed (#895)

    * [setup-r-dependencies]: install quarto if needed
    
    * Add a .qmd vignette to test quarto install
    
    * Implement install-querto properly
    
    Plus better install-pandoc messaging.
    
    * Add quarto dep to test package
    
    * Proper quarto test vignette
    
    * More quarto vignette fixes
    
    * Need explicit Bootstrap 5 for quarto vignette
    
    * Add NEWS for `install-quarto`
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    67f8747 View commit details
  4. check-full example: avoid fixed version number (#892)

    It ages badly when we stop supporting the hardcoded
    version.
    
    Closes #885.
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    95341c3 View commit details
  5. Update OS in check-release action docs (#872)

    jrdnbradford authored Aug 2, 2024
    Copy the full SHA
    f14d6f6 View commit details
  6. [setup-pandoc]: pass GH token to nightly download (#889)

    * [setup-pandoc]: pass GH token to nightly download
    
    This is now needed, apparently.
    
    Closes #868.
    
    * Add NEWS for nightly Pandoc fix
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    565e1cf View commit details
  7. Always cache r lib (#873)

    * use actions/cache@v4's save-always input
    
    * use actions/cache@v4's save-always input
    
    * input name
    
    * Add NEWS for setup-renv bypass-cache: never
    
    ---------
    
    Co-authored-by: Gábor Csárdi <csardi.gabor@gmail.com>
    jaradkohl-mfj and gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    cdb0370 View commit details
  8. Use file names as workflow names (#888)

    * Use file names as workflow names
    
    To make it easier to match workflow runs to workflow files.
    `usethis::use_github_action()` renames the files starting
    with `check-` to `R-CMD-check.yaml` by default, so we
    anticipate that here, except for the no-suggests workflow.
    
    * Update README
    
    * Add NEWS for new workflow names
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    65c3db3 View commit details
  9. Update setup-pandoc deps for GHSA-3g92-w8c5-73pq (#897)

    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    e0a5ffd View commit details
  10. [setup-r-dependencies]: set R_LIBS_USER if unset (#896)

    * [setup-r-dependencies]: set R_LIBS_USER if unset
    
    * Cannot use env.R_LIBS_USER directly in R
    
    Because it uses backslashes on Windows, which means
    invalid escapes in R.
    
    * Message about R_LIBS_USER
    
    * Add NEWS for R_LIBS_USER setting
    
    [ci skip]
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    9677f2e View commit details
  11. [check-r-package]: add 'upload-snapshots: always' (#890)

    Closes #871.
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    15dc534 View commit details
  12. Blogdown and bookdown examples need contents write permission (#874)

    * Enable contents write permission
    
    * Enable contents write permission
    
    * Enable contents write permission
    
    * Enable contents write permission
    
    * Enable contents write permission
    
    * render README.Rmd
    
    * NEWS for fixed repo permissions in examples
    
    ---------
    
    Co-authored-by: Gábor Csárdi <csardi.gabor@gmail.com>
    remlapmot and gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    fd93f72 View commit details
  13. [setup-r]: resolve older R to x86_64 on macOS (#893)

    * [setup-r]: resolve older R to x86_64 on macOS
    
    In fact, try resolving everything on x86_64 as well.
    
    Closes #883.
    
    * Add NEWS for installing x86_64 old R on arm64 macos
    
    Closes #883.
    gaborcsardi authored Aug 2, 2024
    Copy the full SHA
    d1a6cba View commit details
Showing with 2,023 additions and 984 deletions.
  1. +3 −3 .github/workflows/check-full.yaml
  2. +1 −1 .github/workflows/check-release.yaml
  3. +1 −1 .github/workflows/check-standard.yaml
  4. +1 −1 .github/workflows/lint.yaml
  5. +1 −1 .github/workflows/pkgdown.yaml
  6. +1 −0 .github/workflows/scorecard.yml
  7. +1 −1 .github/workflows/test-coverage.yaml
  8. +3 −3 DESCRIPTION
  9. +52 −0 NEWS.md
  10. +2 −0 _pkgdown.yml
  11. +4 −2 check-r-package/action.yaml
  12. +1 −1 examples/README.Rmd
  13. +61 −17 examples/README.md
  14. +1 −1 examples/blogdown-gh-pages.yaml
  15. +3 −1 examples/blogdown.yaml
  16. +1 −1 examples/bookdown-gh-pages.yaml
  17. +3 −1 examples/bookdown.yaml
  18. +3 −3 examples/check-full.yaml
  19. +2 −2 examples/check-no-suggests.yaml
  20. +1 −1 examples/check-release.yaml
  21. +1 −1 examples/check-standard.yaml
  22. +3 −1 examples/document.yaml
  23. +2 −2 examples/html-5-check.yaml
  24. +1 −1 examples/lint-changed-files.yaml
  25. +1 −1 examples/lint-project.yaml
  26. +1 −1 examples/lint.yaml
  27. +1 −1 examples/pkgdown.yaml
  28. +5 −1 examples/pr-commands.yaml
  29. +3 −1 examples/render-rmarkdown.yaml
  30. +1 −1 examples/shiny-deploy.yaml
  31. +1 −1 examples/style.yaml
  32. +1 −1 examples/test-coverage.yaml
  33. +1,730 −906 setup-pandoc/dist/index.js
  34. +1 −1 setup-pandoc/dist/index.js.map
  35. +4 −3 setup-pandoc/package-lock.json
  36. +1 −1 setup-pandoc/src/setup-pandoc.ts
  37. +12 −4 setup-r-dependencies/README.md
  38. +60 −2 setup-r-dependencies/action.yaml
  39. +1 −1 setup-r/dist/index.js
  40. +1 −1 setup-r/dist/index.js.map
  41. +21 −7 setup-r/src/installer.ts
  42. +3 −1 setup-renv/README.md
  43. +2 −1 setup-renv/action.yaml
  44. +19 −0 vignettes/quarto-test.qmd
  45. +1 −2 vignettes/test.Rmd
6 changes: 3 additions & 3 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ on:
pull_request:
branches: [main, master, v2-branch]

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

permissions: read-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'}
2 changes: 1 addition & 1 deletion .github/workflows/check-release.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
pull_request:
branches: [main, master, v2-branch]

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

permissions: read-all

2 changes: 1 addition & 1 deletion .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
pull_request:
branches: [main, master, v2-branch]

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

permissions: read-all

2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
pull_request:
branches: [main, master, v2-branch]

name: lint
name: lint.yaml

permissions: read-all

2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ on:
types: [published]
workflow_dispatch:

name: pkgdown
name: pkgdown.yaml

permissions: read-all

1 change: 1 addition & 0 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ jobs:
with:
results_file: results.sarif
results_format: sarif
repo_token: ${{ secrets.SCORECARD_TOKEN }}
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
# - you want to enable the Branch-Protection check on a *public* repository, or
# - you are installing Scorecard on a *private* repository
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
pull_request:
branches: [main, master, v2-branch]

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

permissions: read-all

6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Package: testpackage
Title: A Simple Test Description File to Test Packages
Version: 1.0.0
Authors@R:
Authors@R:
c(person(given = "Jim",
family = "Hester",
role = c("aut", "cre"),
email = "james.hester@rstudio.com"))
Description: This is a simple package used to test the workflow files.
Imports: xml2, curl
Suggests: covr, knitr, rmarkdown, testthat
Suggests: covr, knitr, rmarkdown, testthat, quarto
License: GPL (>= 2)
VignetteBuilder: knitr, rmarkdown
VignetteBuilder: knitr, rmarkdown, quarto
52 changes: 52 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,55 @@
# Development version (unreleased)

* `[setup-r]`: on R 3.6.x we now use the P3M snapshot from 2024-06-01 by
default. This is because many newer CRAN packages do not work on R 3.6.x
any more. The default CRAN mirror is still added, so newer packages may
be used if they are required, but `setup-r-dependencies@v2` will prefer
the binary packages from P3M.

Note that this only happens if you opt in to use P3M with the
`use-public-rspm: true` input parameter. This is the default in all
example workflows.

If the `RSPM` environment variable is already set, then it is used
unchanged, on all R versions. To avoid using a P3M snapshot on R 3.6.x,
set the `RSPM_PIN_3_6` environment variable to `false`.

* `[setup-r]` now installs the x86_64 build of R on arm64 macOS, if there
is no arm64 build available for this R version (#883).

* Example blogdown, bookdown, document, pr-commands and render-markdown
workflows now correctly have write permission to repository contents
(#874, @remlapmot).

* `[check-r-package]`: you can now set`upload-snapshots` to `always`, to
upload snapshots even after failures (#871).

* `[setup-r-dependencies]` now always sets the `R_LIBS_USER` GitHub
environment variable, so it can be used without `[setup-r]` or without
setting it manually (#881).

* The example workflows now use their file names as workflow names.
This is to make it easier to match worflow runs to workflow files.
Most of the the `check-*` workflows use `R-CMD-check.yaml`, however,
to anticipate the usethis package renaming them by default (#888).

* `[setup-renv]`: you can now set `bypass-cache` to `never`, to save the
cache even if the workflow fails (#873, @jaradkohl-mfj).

* `[setup-pandoc]`: installing nightly Pandoc works again now (#889).

* `[setup-r-dependencies]` now automatically installs Quarto if the repo
has a qmd file, and it isn't installed. See the `install-quarto` and
`quarto-version` input parameters (#866).

* `[setup-r]` now avoids spurious warnings from Homebrew (#864).

* `[setup-r-dependencies]` now accepts `pak-version: none` to skip pak
installation. pak should be already installed on the system in this
case, otherwise the dependencies resolution and installation will fail.
You probably also need to set the `R_LIB_FOR_PAK` env var to the library
where it is installed.

# `v2.9.0` (2024-05-09)

* The `test-coverage.yaml` example workflow now handles global Codecov
2 changes: 2 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
template:
bootstrap: 5
6 changes: 4 additions & 2 deletions check-r-package/action.yaml
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@ inputs:
description: 'Using the working-directory keyword, you can specify the working directory of where "rcmdcheck::rcmdcheck" is run.'
default: '.'
upload-snapshots:
description: 'Whether to upload all testthat snapshots as an artifact.'
description: |
Whether to upload all testthat snapshots as an artifact. Possible values are 'true',
'false', 'always'.
default: false
upload-results:
description: |
@@ -66,7 +68,7 @@ runs:
path: ${{ steps.rcmdcheck.outputs.check-dir-path }}

- name: Upload snapshots
if: ${{ inputs.upload-snapshots != 'false' }}
if: ${{ (failure() && inputs.upload-snapshots == 'always') || inputs.upload-snapshots != 'false' }}
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.snapshot-artifact-name || format('{0}-{1}-r{2}-{3}-testthat-snapshots', runner.os, runner.arch, matrix.config.r, matrix.config.id || strategy.job-index ) }}
2 changes: 1 addition & 1 deletion examples/README.Rmd
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ Options and advice:

`usethis::use_github_action("check-release")`

This workflow installs latest release R version on macOS
This workflow installs latest release R version on linux
and runs R CMD check via the [rcmdcheck](https://github.com/r-lib/rcmdcheck)
package. If this is the first time you have used CI for a project this is
probably what you want to use.
Loading