Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix format string for CRAN #57

Merged
merged 9 commits into from
Dec 4, 2023
Merged

fix format string for CRAN #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a9765e
fix format string for CRAN
richfitz Nov 28, 2023
789ecaf
Fix url
richfitz Nov 28, 2023
6844d64
Bump version
richfitz Nov 28, 2023
aee9b78
Upgrade workflow version
richfitz Nov 28, 2023
284312c
Fix broken yaml
richfitz Nov 28, 2023
ee458e8
Fix expired test
richfitz Nov 29, 2023
0d6caa9
Fix another expired test
richfitz Nov 29, 2023
1c4dde4
Try again with expired test
richfitz Nov 29, 2023
0066882
Skip test on windows
richfitz Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- name: Start Redis
if: runner.os != 'Windows'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pkgdown.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- name: Start Redis
uses: shogo82148/actions-setup-redis@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-coverage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- name: Start Redis
uses: shogo82148/actions-setup-redis@v1
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: redux
Title: R Bindings to 'hiredis'
Version: 1.1.3
Version: 1.1.4
Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
email = "[email protected]"))
Description: A 'hiredis' wrapper that includes support for
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- badges: start -->
[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/)
[![R build status](https://github.com/richfitz/redux/workflows/R-CMD-check/badge.svg)](https://github.com/richfitz/redux/actions)
[![codecov.io](https://codecov.io/github/richfitz/redux/coverage.svg?branch=master)](https://codecov.io/github/richfitz/redux?branch=master)
[![codecov.io](https://codecov.io/github/richfitz/redux/coverage.svg?branch=master)](https://app.codecov.io/github/richfitz/redux?branch=master)
[![](https://www.r-pkg.org/badges/version/redux)](https://cran.r-project.org/package=redux)
<!-- badges: end -->

Expand Down
2 changes: 1 addition & 1 deletion src/conversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ SEXP reply_error(redisReply* reply, bool error_throw) {
memcpy(msg, reply->str, reply->len);
msg[reply->len] = '\0';
freeReplyObject(reply);
error(msg);
error("%s", msg);
return ret;
} else { // pass error back as object
SEXP ret = PROTECT(mkString(reply->str));
Expand Down
4 changes: 3 additions & 1 deletion tests/testthat/test-conversions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ test_that("long integers", {
on.exit(con$DEL(key))

con$SET(key, "Hello")
expect_equal(con$PEXPIREAT(key, 1655555555005), 1)

t <- as.integer(con$TIME()[[1]])
expect_equal(con$EXPIREAT(key, t + 1000000000), 1)

t0 <- con$TTL(key)
t1 <- con$PTTL(key)
Expand Down
4 changes: 3 additions & 1 deletion tests/testthat/test-zzz-commands-generic.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ test_that("MOVE", {

test_that("OBJECT", {
skip_if_cmd_unsupported("OBJECT")
testthat::skip_on_os("windows") # need to find out what this produces here
con <- test_hiredis_connection()
key <- rand_str()
on.exit(con$DEL(key))
Expand Down Expand Up @@ -138,7 +139,8 @@ test_that("PEXPIREAT", {
on.exit(con$DEL(key))

con$SET(key, "Hello")
expect_equal(con$PEXPIREAT(key, 1655555555005), 1)
t <- as.numeric(con$TIME()[[1]]) * 1000
expect_equal(con$PEXPIREAT(key, t + 1000000000), 1)
expect_gt(con$TTL(key), 0)
expect_gt(con$PTTL(key), 0)
})
Expand Down
Loading