diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 003db772..6e4eee24 100644 --- 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 index 696ba67f..9ca0281a 100644 --- a/Appraisals +++ b/Appraisals @@ -8,41 +8,36 @@ appraise "rack_2" do gem "rack", "~> 2.0" end -appraise 'rails_8-1' do - gem 'railties', '~> 8.1.0' +appraise "rails_8-1" do + gem "railties", "~> 8.1.0" end -appraise 'rails_8-0' do - gem 'railties', '~> 8.0.0' +appraise "rails_8-0" do + gem "railties", "~> 8.0.0" end -appraise 'rails_7-2' do - gem 'railties', '~> 7.2.0' +appraise "rails_7-2" do + gem "railties", "~> 7.2.0" end -appraise 'rails_7-1' do - gem 'railties', '~> 7.1.0' +appraise "rails_7-1" do + gem "railties", "~> 7.1.0" end -appraise 'rails_7-0' do - gem 'railties', '~> 7.0.0' +appraise "rails_7-0" do + gem "railties", "~> 7.0.0" end -appraise 'dalli3' do - gem 'dalli', '~> 3.0' +appraise "dalli3" do + gem "dalli", "~> 3.0" end -appraise 'redis_5' do - gem 'redis', '~> 5.0' +appraise "redis_5" do + gem "redis", "~> 5.0" end -appraise 'redis_4' do - gem 'redis', '~> 4.0' -end - -appraise "connection_pool_dalli" do - gem "connection_pool", "~> 2.2" - gem "dalli", "~> 3.0" +appraise "redis_4" do + gem "redis", "~> 4.0" end appraise "active_support_8-1_redis_cache_store" do @@ -50,56 +45,26 @@ appraise "active_support_8-1_redis_cache_store" do 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" 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 "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 "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 "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 gem "redis-store", "~> 1.5" end diff --git a/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile deleted file mode 100644 index bd2a6e71..00000000 --- a/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 7.0.0" -gem "connection_pool", "~> 2.2" -gem "redis", "~> 5.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile deleted file mode 100644 index ae2d6d96..00000000 --- a/gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 7.1.0" -gem "connection_pool", "~> 2.2" -gem "redis", "~> 5.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile deleted file mode 100644 index 3b441b0b..00000000 --- a/gemfiles/active_support_7_2_redis_cache_store_pooled.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 7.2.0" -gem "connection_pool", "~> 2.2" -gem "redis", "~> 5.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile b/gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile deleted file mode 100644 index 4d80d168..00000000 --- a/gemfiles/active_support_8_0_redis_cache_store_pooled.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 8.0.0" -gem "connection_pool", "~> 2.2" -gem "redis", "~> 5.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile b/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile deleted file mode 100644 index 6e49595b..00000000 --- a/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "activesupport", "~> 8.1.0" -gem "connection_pool", "~> 2.2" -gem "redis", "~> 5.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/gemfiles/connection_pool_dalli.gemfile b/gemfiles/connection_pool_dalli.gemfile deleted file mode 100644 index f84eb52e..00000000 --- a/gemfiles/connection_pool_dalli.gemfile +++ /dev/null @@ -1,13 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "connection_pool", "~> 2.2" -gem "dalli", "~> 3.0" - -group :maintenance, optional: true do - gem "bake" - gem "bake-gem" -end - -gemspec path: "../" diff --git a/rack-attack.gemspec b/rack-attack.gemspec index 41cc7a8f..fe2e1566 100644 --- 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