Skip to content

Commit

Permalink
Merge pull request #38 from delano/34-ci-workflow
Browse files Browse the repository at this point in the history
Support redis-rb 5.x
  • Loading branch information
delano authored Jun 17, 2024
2 parents d4d8275 + 41d7f40 commit c1f15eb
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 13 deletions.
26 changes: 22 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,45 @@ on:
jobs:
build:
runs-on: ubuntu-latest
name: Ruby ${{ matrix.ruby }}
name: "Ruby ${{ matrix.ruby }} w/ redis:${{ matrix.redis }}"
strategy:
fail-fast: true
matrix:
include:
- ruby: '3.3'
bundler: latest
rubygems: latest
redis: 5.2

- ruby: '3.2'
bundler: latest
rubygems: latest
redis: 5.2

- ruby: '3.2'
bundler: latest
rubygems: latest
redis: 4.8

- ruby: '3.2'
bundler: latest
rubygems: latest
redis: 4.7

- ruby: '3.1'
bundler: latest
rubygems: latest
redis: 5.2

- ruby: '3.0'
bundler: latest
rubygems: latest
redis: 5.2

- ruby: '2.7'
bundler: '2.4.22'
rubygems: '3.2.3'
redis: 5.2

services:
redis:
Expand Down Expand Up @@ -62,10 +78,12 @@ jobs:
# and cache the result automatically. Ran into an issue
# with the caching and multiple ruby versions. Needs
# further investigation.
bundler-cache: false
bundler-cache: true # runs bundle install

- name: Re-run bundle install
run: bundle install
- name: Install redis gem @ ${{ matrix.redis }}
if: matrix.redis != ''
run: |
gem install redis --version ${{ matrix.redis }}
- name: Run the tryouts
run: bundle exec try -v try/*_try.rb
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ REDIS-DUMP, CHANGES

#### 0.6.0 (2024-06-17) ###############################

* ADDED: Supports redis-rb 5.0
* ADDED: Supports SSL via rediss://
* CHANGED: Updated dependencies (see https://github.com/delano/redis-dump/pull/37)
* FIXED: Resolved `sadd` warnings in redis 4.0 #35


#### 0.5.0 (2023-01-17) ###############################

Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

source "https://rubygems.org"

gem "redis", ">= 4.0", "< 5.0"
gem "drydock", ">= 0.6.9"
gem "oj", ">= 3.16.4"
gem "redis", ">= 4.0", "< 6.0"
gem "uri-redis", ">= 1.3.0"
gem "yajl-ruby", ">= 1.4.3"
gem "oj", ">= 3.16.4"
gem "drydock", ">= 0.6.9"

gem "pry-byebug", "~> 3.10.1", require: false, group: :development
gem "rake", "~> 13.0", require: false, group: :development
gem "rubocop", "~> 1.64.1", require: false, group: :development
gem "tryouts", "~> 2.2.0", require: false, group: :development
gem "pry-byebug", "~> 3.10.1", require: false, group: :development
8 changes: 6 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GEM
bigdecimal (3.1.8)
byebug (11.1.3)
coderay (1.1.3)
connection_pool (2.4.1)
drydock (0.6.9)
json (2.7.2)
language_server-protocol (3.17.0.3)
Expand All @@ -24,7 +25,10 @@ GEM
racc (1.8.0)
rainbow (3.1.1)
rake (13.2.1)
redis (4.8.1)
redis (5.2.0)
redis-client (>= 0.22.0)
redis-client (0.22.2)
connection_pool
regexp_parser (2.9.2)
rexml (3.3.0)
strscan
Expand Down Expand Up @@ -62,7 +66,7 @@ DEPENDENCIES
oj (>= 3.16.4)
pry-byebug (~> 3.10.1)
rake (~> 13.0)
redis (>= 4.0, < 5.0)
redis (>= 4.0, < 6.0)
rubocop (~> 1.64.1)
tryouts (~> 2.2.0)
uri-redis (>= 1.3.0)
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Redis::Dump - v0.5 PRE
# Redis::Dump - v0.6.0

*Redis to JSON and back again. Dump and load Redis databases to/from JSON files.*

*Backup and restore your Redis data to and from JSON.*

## Installation

Expand Down
2 changes: 1 addition & 1 deletion lib/redis/dump/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

class Redis
class Dump
VERSION = "0.5.0-pre"
VERSION = "0.6.0"
end
end

0 comments on commit c1f15eb

Please sign in to comment.