Skip to content

Commit 80a307c

Browse files
Merge 89ea11a into 20c5b37
2 parents 20c5b37 + 89ea11a commit 80a307c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/check-full.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
- uses: r-lib/actions/check-r-package@v2
5757
with:
5858
upload-snapshots: true
59+
upload-results: true
5960
error-on: 'ifelse(getRversion() > "3.6", "warning", "note")'
6061
env:
6162
_R_CHECK_FORCE_SUGGESTS_: false

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66

77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.3.2.9027
9+
rev: v0.4.0
1010
hooks:
1111
- id: style-files
1212
args:
@@ -101,7 +101,7 @@ repos:
101101
)$
102102
- id: pkgdown
103103
- repo: https://github.com/pre-commit/pre-commit-hooks
104-
rev: v4.4.0
104+
rev: v4.5.0
105105
hooks:
106106
- id: check-added-large-files
107107
args: ["--maxkb=200"]
@@ -119,7 +119,7 @@ repos:
119119
tests/testthat/_snaps/.*|
120120
)$
121121
- repo: https://github.com/lorenzwalthert/gitignore-tidy
122-
rev: 475bf5d96927a1887ce2863ff3075b1d7240bc51
122+
rev: 517cddbf1d8514ddaf43159686617ae65895dc99
123123
hooks:
124124
- id: tidy-gitignore
125125
- repo: local

tests/testthat/test-parsing.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ test_that("CRLF EOLs fail with informative error", {
2929

3030

3131
test_that("mixed CRLF / LF EOLs fail", {
32+
error_msg_stem <- if (getRversion() < "4.4") "unexpected input" else "unexpected invalid token"
3233
expect_error(
3334
style_text("a + 3 -4 -> x\nx + 2\r\n glück + 1"),
34-
"unexpected input"
35+
error_msg_stem
3536
)
3637
})
3738

0 commit comments

Comments
 (0)