Skip to content

Commit c05ab8f

Browse files
authored
Fix CI (#487)
1 parent cba5769 commit c05ab8f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.lintr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
linters: linters_with_defaults(
22
line_length_linter = line_length_linter(120L),
33
object_name_linter = object_name_linter(styles = c("snake_case", "symbols", "CamelCase")),
4-
cyclocomp_linter = NULL, # Issues with R6 classes.
54
object_length_linter(32L),
65
indentation_linter = indentation_linter(hanging_indent_style = "tidy"),
7-
return_linter = NULL
6+
return_linter = NULL,
7+
pipe_consistency_linter = pipe_consistency_linter("auto")
88
)
99
exclusions: list(
1010
"tests/testthat/2024.07.0/",

tests/integrated/helper.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ expect_ptype_equal <- function(actual, expected, exact = TRUE) {
99
}
1010

1111
skip_if_connect_older_than <- function(client, version) {
12-
if (numeric_version(safe_server_version(client)) < numeric_version(version)) {
12+
current <- numeric_version(simplify_version(safe_server_version(client)))
13+
if (current < numeric_version(version)) {
1314
skip(paste("Requires Connect >=", version))
1415
}
1516
}

tests/testthat/test-utils.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ test_that("simplify_version works", {
33
expect_identical(simplify_version("1.8.2.1-4"), "1.8.2")
44
expect_identical(simplify_version("10.70.204.1-4"), "10.70.204")
55
expect_identical(simplify_version("10.0.0.0-4"), "10.0.0")
6+
expect_identical(simplify_version("2026.01.0-dev+15-z596093a50w"), "2026.01.0")
67
})
78

89
test_that("compare_connect_version works", {

0 commit comments

Comments
 (0)