From 96ec89e5e69ce24dfdb9be079827779e0d2b74af Mon Sep 17 00:00:00 2001
From: Gonzalo <456459+grzuy@users.noreply.github.com>
Date: Mon, 12 Jun 2023 15:47:22 -0300
Subject: [PATCH 1/2] ci: tests against redis gem v5

---
 .github/workflows/build.yml                          |  2 +-
 Appraisals                                           | 12 ++++++------
 gemfiles/active_support_redis_cache_store.gemfile    |  2 +-
 .../active_support_redis_cache_store_pooled.gemfile  |  2 +-
 gemfiles/{redis_3.gemfile => redis_5.gemfile}        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename gemfiles/{redis_3.gemfile => redis_5.gemfile} (80%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7552edf5..b4a41ae4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,8 +32,8 @@ jobs:
           - rails_4_2
           - dalli3
           - dalli2
+          - redis_5
           - redis_4
-          - redis_3
           - connection_pool_dalli
           - active_support_redis_cache_store
           - active_support_redis_cache_store_pooled
diff --git a/Appraisals b/Appraisals
index 9035597e..335385b0 100644
--- a/Appraisals
+++ b/Appraisals
@@ -49,12 +49,12 @@ appraise 'dalli3' do
   gem 'dalli', '~> 3.0'
 end
 
-appraise 'redis_4' do
-  gem 'redis', '~> 4.0'
+appraise 'redis_5' do
+  gem 'redis', '~> 5.0'
 end
 
-appraise 'redis_3' do
-  gem 'redis', '~> 3.3'
+appraise 'redis_4' do
+  gem 'redis', '~> 4.0'
 end
 
 appraise "connection_pool_dalli" do
@@ -64,13 +64,13 @@ end
 
 appraise "active_support_redis_cache_store" do
   gem "activesupport", "~> 6.1.0"
-  gem "redis", "~> 4.0"
+  gem "redis", "~> 5.0"
 end
 
 appraise "active_support_redis_cache_store_pooled" do
   gem "activesupport", "~> 6.1.0"
   gem "connection_pool", "~> 2.2"
-  gem "redis", "~> 4.0"
+  gem "redis", "~> 5.0"
 end
 
 appraise "redis_store" do
diff --git a/gemfiles/active_support_redis_cache_store.gemfile b/gemfiles/active_support_redis_cache_store.gemfile
index 8acbbe13..21a16e7d 100644
--- a/gemfiles/active_support_redis_cache_store.gemfile
+++ b/gemfiles/active_support_redis_cache_store.gemfile
@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 6.1.0"
-gem "redis", "~> 4.0"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"
diff --git a/gemfiles/active_support_redis_cache_store_pooled.gemfile b/gemfiles/active_support_redis_cache_store_pooled.gemfile
index cf1e92e2..f74738f2 100644
--- a/gemfiles/active_support_redis_cache_store_pooled.gemfile
+++ b/gemfiles/active_support_redis_cache_store_pooled.gemfile
@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activesupport", "~> 6.1.0"
 gem "connection_pool", "~> 2.2"
-gem "redis", "~> 4.0"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"
diff --git a/gemfiles/redis_3.gemfile b/gemfiles/redis_5.gemfile
similarity index 80%
rename from gemfiles/redis_3.gemfile
rename to gemfiles/redis_5.gemfile
index 403482c1..0aac1021 100644
--- a/gemfiles/redis_3.gemfile
+++ b/gemfiles/redis_5.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "redis", "~> 3.3"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"

From f69665c915fa8a39565db0a4eb9c4709b38b2a04 Mon Sep 17 00:00:00 2001
From: Gonzalo <456459+grzuy@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:29:07 -0300
Subject: [PATCH 2/2] ci: fixes incompatibility between redis-store 1.9.2 and
 redis 5

---
 Appraisals                                  | 1 +
 gemfiles/active_support_redis_store.gemfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Appraisals b/Appraisals
index 335385b0..14727233 100644
--- a/Appraisals
+++ b/Appraisals
@@ -79,4 +79,5 @@ end
 
 appraise "active_support_redis_store" do
   gem "redis-activesupport", "~> 5.0"
+  gem 'redis-store', '1.9.1' # remove after https://github.com/redis-store/redis-store/issues/358 is resolved
 end
diff --git a/gemfiles/active_support_redis_store.gemfile b/gemfiles/active_support_redis_store.gemfile
index 517c70f9..b3567fa3 100644
--- a/gemfiles/active_support_redis_store.gemfile
+++ b/gemfiles/active_support_redis_store.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "redis-activesupport", "~> 5.0"
+gem "redis-store", "1.9.1"
 
 gemspec path: "../"