From e41d1f220529b9c1bead9b9a07536e3acae03203 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 27 Feb 2023 14:39:18 +0100 Subject: [PATCH 1/6] Following the doc, remove `hiredis` and use `hiredis-client` Reference: - https://github.com/redis/redis-rb/issues/1178 - https://github.com/redis/redis-rb#hiredis-binding --- Gemfile | 4 ++-- Gemfile.lock | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a1aaff4c5b..989a3916d0 100644 --- a/Gemfile +++ b/Gemfile @@ -96,9 +96,9 @@ gem 'rack-rewrite' gem 'rack-timeout' gem 'roadie-rails' -gem 'hiredis' gem 'puma' -gem 'redis', '>= 4.0', require: ['redis', 'redis/connection/hiredis'] +gem 'redis', '>= 4.0' +gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler' diff --git a/Gemfile.lock b/Gemfile.lock index 4567f5d55b..b8933cbee3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,7 +337,8 @@ GEM hashery (2.1.2) hashie (5.0.0) highline (2.0.3) - hiredis (0.6.3) + hiredis-client (0.12.1) + redis-client (= 0.12.1) htmlentities (4.3.4) httpclient (2.8.3) i18n (1.14.1) @@ -841,7 +842,7 @@ DEPENDENCIES good_migrations haml highline (= 2.0.3) - hiredis + hiredis-client i18n i18n-js (~> 3.9.0) image_processing From 520ced350ef14fada473f51f5b977f66b8c90cd7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 27 Feb 2023 14:41:05 +0100 Subject: [PATCH 2/6] Do not specify redis version --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 989a3916d0..256f6dd40d 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem 'rack-timeout' gem 'roadie-rails' gem 'puma' -gem 'redis', '>= 4.0' +gem 'redis' gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler' diff --git a/Gemfile.lock b/Gemfile.lock index b8933cbee3..8df3150974 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -885,7 +885,7 @@ DEPENDENCIES rails_safe_tasks (~> 1.0) ransack (~> 2.6.0) redcarpet - redis (>= 4.0) + redis responders rexml roadie-rails From 02432ee2ecbede986c198eb898603beba1c91bee Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 27 Feb 2023 15:11:52 +0100 Subject: [PATCH 3/6] Do not upgrade to redis >= 5 since Redis >= 3, < 5 is actually a requirement of Action Cable Redis subscription adapter until Rails 7.0.4. https://github.com/rails/rails/blob/v6.1.7/actioncable/lib/action_cable/subscription_adapter/redis.rb --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 256f6dd40d..b236468b7e 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem 'rack-timeout' gem 'roadie-rails' gem 'puma' -gem 'redis' +gem 'redis', "< 5" gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler' diff --git a/Gemfile.lock b/Gemfile.lock index 8df3150974..7d8c89fcd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -885,7 +885,7 @@ DEPENDENCIES rails_safe_tasks (~> 1.0) ransack (~> 2.6.0) redcarpet - redis + redis (< 5) responders rexml roadie-rails @@ -928,4 +928,4 @@ RUBY VERSION ruby 3.0.3p157 BUNDLED WITH - 2.4.3 + 2.4.4 From b85cf269078eea972b0cf07530be5b42da0b2f03 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 1 Mar 2023 09:25:49 +1100 Subject: [PATCH 4/6] Add comment --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b236468b7e..bd044c5621 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem 'rack-timeout' gem 'roadie-rails' gem 'puma' -gem 'redis', "< 5" +gem 'redis', "< 5" # a requirement of Action Cable Redis subscription adapter until Rails 7.0.4. gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler' From 4564021f793bb6ce582e132586c9c14af1ab5303 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Tue, 13 Jun 2023 15:06:52 +1000 Subject: [PATCH 5/6] Remove redis version limitation --- Gemfile | 2 +- Gemfile.lock | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index bd044c5621..256f6dd40d 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,7 @@ gem 'rack-timeout' gem 'roadie-rails' gem 'puma' -gem 'redis', "< 5" # a requirement of Action Cable Redis subscription adapter until Rails 7.0.4. +gem 'redis' gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler' diff --git a/Gemfile.lock b/Gemfile.lock index 7d8c89fcd9..215ac8e274 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -337,8 +337,8 @@ GEM hashery (2.1.2) hashie (5.0.0) highline (2.0.3) - hiredis-client (0.12.1) - redis-client (= 0.12.1) + hiredis-client (0.14.1) + redis-client (= 0.14.1) htmlentities (4.3.4) httpclient (2.8.3) i18n (1.14.1) @@ -570,7 +570,8 @@ GEM rdf (3.2.9) link_header (~> 0.0, >= 0.0.8) redcarpet (3.6.0) - redis (4.8.1) + redis (5.0.6) + redis-client (>= 0.9.0) redis-client (0.14.1) connection_pool regexp_parser (2.8.1) @@ -885,7 +886,7 @@ DEPENDENCIES rails_safe_tasks (~> 1.0) ransack (~> 2.6.0) redcarpet - redis (< 5) + redis responders rexml roadie-rails @@ -928,4 +929,4 @@ RUBY VERSION ruby 3.0.3p157 BUNDLED WITH - 2.4.4 + 2.4.5 From 694e46d1fb0dbfb3bbe74672ff51119cc56b2c31 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Tue, 13 Jun 2023 15:35:40 +1000 Subject: [PATCH 6/6] Fix Bundler/OrderedGems --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 256f6dd40d..ec55e818aa 100644 --- a/Gemfile +++ b/Gemfile @@ -96,9 +96,9 @@ gem 'rack-rewrite' gem 'rack-timeout' gem 'roadie-rails' +gem "hiredis-client" gem 'puma' gem 'redis' -gem "hiredis-client" gem 'sidekiq' gem 'sidekiq-scheduler'