Try more aggressive approach

santib · santib · commit 2b828af1eae0 · 2025-12-30T09:56:08.000-03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,25 +35,17 @@ jobs:
           - dalli3
           - redis_5
           - redis_4
-          - connection_pool_dalli
           - active_support_8_1_redis_cache_store
-          - active_support_8_1_redis_cache_store_pooled
           - active_support_8_0_redis_cache_store
-          - active_support_8_0_redis_cache_store_pooled
           - active_support_7_2_redis_cache_store
-          - active_support_7_2_redis_cache_store_pooled
           - active_support_7_1_redis_cache_store
-          - active_support_7_1_redis_cache_store_pooled
           - active_support_7_0_redis_cache_store
-          - active_support_7_0_redis_cache_store_pooled
           - redis_store
         exclude:
           - gemfile: rails_7_0
             ruby: '3.4'
           - gemfile: active_support_7_0_redis_cache_store
             ruby: '3.4'
-          - gemfile: active_support_7_0_redis_cache_store_pooled
-            ruby: '3.4'
           - gemfile: rails_7_2
             ruby: '3.0'
           - gemfile: rails_7_2
@@ -62,10 +54,6 @@ jobs:
             ruby: '3.0'
           - gemfile: active_support_7_2_redis_cache_store
             ruby: '2.7'
-          - gemfile: active_support_7_2_redis_cache_store_pooled
-            ruby: '3.0'
-          - gemfile: active_support_7_2_redis_cache_store_pooled
-            ruby: '2.7'
           - gemfile: rails_8_0
             ruby: '3.1'
           - gemfile: rails_8_0
@@ -78,12 +66,6 @@ jobs:
             ruby: '3.0'
           - gemfile: active_support_8_0_redis_cache_store
             ruby: '2.7'
-          - gemfile: active_support_8_0_redis_cache_store_pooled
-            ruby: '3.1'
-          - gemfile: active_support_8_0_redis_cache_store_pooled
-            ruby: '3.0'
-          - gemfile: active_support_8_0_redis_cache_store_pooled
-            ruby: '2.7'
           - gemfile: rails_8_1
             ruby: '3.1'
           - gemfile: rails_8_1
@@ -96,12 +78,6 @@ jobs:
             ruby: '3.0'
           - gemfile: active_support_8_1_redis_cache_store
             ruby: '2.7'
-          - gemfile: active_support_8_1_redis_cache_store_pooled
-            ruby: '3.1'
-          - gemfile: active_support_8_1_redis_cache_store_pooled
-            ruby: '3.0'
-          - gemfile: active_support_8_1_redis_cache_store_pooled
-            ruby: '2.7'
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
diff --git a/Appraisals b/Appraisals
@@ -29,98 +29,42 @@ appraise "rails_7-0" do
 end
 
 appraise "dalli3" do
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/petergoldstein/dalli/pull/1049 is fixed and released
-  gem "connection_pool", "~> 2.5"
   gem "dalli", "~> 3.0"
 end
 
 appraise "redis_5" do
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/rails/rails#56291 is fixed and released
-  gem "connection_pool", "~> 2.5"
   gem "redis", "~> 5.0"
 end
 
 appraise "redis_4" do
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/rails/rails#56291 is fixed and released
-  gem "connection_pool", "~> 2.5"
   gem "redis", "~> 4.0"
 end
 
-appraise "connection_pool_dalli" do
-  gem "connection_pool", "~> 2.2"
-  gem "dalli", "~> 3.0"
-end
-
 appraise "active_support_8-1_redis_cache_store" do
   gem "activesupport", "~> 8.1.0"
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/rails/rails#56291 is fixed and released
-  gem "connection_pool", "~> 2.5"
-  gem "redis", "~> 5.0"
-end
-
-appraise "active_support_8-1_redis_cache_store_pooled" do
-  gem "activesupport", "~> 8.1.0"
-  gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
 appraise "active_support_8-0_redis_cache_store" do
   gem "activesupport", "~> 8.0.0"
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/rails/rails#56291 is fixed and released
-  gem "connection_pool", "~> 2.5"
-  gem "redis", "~> 5.0"
-end
-
-appraise "active_support_8-0_redis_cache_store_pooled" do
-  gem "activesupport", "~> 8.0.0"
-  gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
 appraise "active_support_7-2_redis_cache_store" do
   gem "activesupport", "~> 7.2.0"
-  gem "connection_pool", "~> 2.5"
-  gem "redis", "~> 5.0"
-end
-
-appraise "active_support_7-2_redis_cache_store_pooled" do
-  gem "activesupport", "~> 7.2.0"
-  gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
 appraise "active_support_7-1_redis_cache_store" do
   gem "activesupport", "~> 7.1.0"
-  gem "connection_pool", "~> 2.5"
-  gem "redis", "~> 5.0"
-end
-
-appraise "active_support_7-1_redis_cache_store_pooled" do
-  gem "activesupport", "~> 7.1.0"
-  gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
 appraise "active_support_7-0_redis_cache_store" do
   gem "activesupport", "~> 7.0.0"
-  gem "connection_pool", "~> 2.5"
-  gem "redis", "~> 5.0"
-end
-
-appraise "active_support_7-0_redis_cache_store_pooled" do
-  gem "activesupport", "~> 7.0.0"
-  gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
 appraise "redis_store" do
-  # Direct version requirement on connection_pool
-  # can be removed once https://github.com/rails/rails#56291 is fixed and released
-  gem "connection_pool", "~> 2.5"
   gem "redis-store", "~> 1.5"
 end
diff --git a/gemfiles/active_support_7_0_redis_cache_store.gemfile b/gemfiles/active_support_7_0_redis_cache_store.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 7.0.0"
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile
diff --git a/gemfiles/active_support_7_1_redis_cache_store.gemfile b/gemfiles/active_support_7_1_redis_cache_store.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 7.1.0"
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile
diff --git a/gemfiles/active_support_7_2_redis_cache_store.gemfile b/gemfiles/active_support_7_2_redis_cache_store.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 7.2.0"
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile
diff --git a/gemfiles/active_support_8_0_redis_cache_store.gemfile b/gemfiles/active_support_8_0_redis_cache_store.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 8.0.0"
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile b/gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile
diff --git a/gemfiles/active_support_8_1_redis_cache_store.gemfile b/gemfiles/active_support_8_1_redis_cache_store.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 8.1.0"
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile b/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile
diff --git a/gemfiles/connection_pool_dalli.gemfile b/gemfiles/connection_pool_dalli.gemfile
diff --git a/gemfiles/dalli3.gemfile b/gemfiles/dalli3.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "connection_pool", "~> 2.5"
 gem "dalli", "~> 3.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/redis_4.gemfile b/gemfiles/redis_4.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 4.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/redis_5.gemfile b/gemfiles/redis_5.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "connection_pool", "~> 2.5"
 gem "redis", "~> 5.0"
 
 group :maintenance, optional: true do
diff --git a/gemfiles/redis_store.gemfile b/gemfiles/redis_store.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "connection_pool", "~> 2.5"
 gem "redis-store", "~> 1.5"
 
 group :maintenance, optional: true do
diff --git a/rack-attack.gemspec b/rack-attack.gemspec
@@ -46,4 +46,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency "activesupport"
+  # Fix activesupport Direct version requirement on connection_pool
+  # can be removed once https://github.com/rails/rails/issues/56291 is ixed and released
+  s.add_development_dependency "connection_pool", "~> 2.5"
 end
