Merge branch 'main' into version-updates

rack · Oct 26, 2023 · 2b71621 · 2b71621
2 parents 1a489b9 + c7098d6
commit 2b71621
Show file tree

Hide file tree

Showing 24 changed files with 247 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,26 +37,59 @@ jobs:
           - redis_5
           - redis_4
           - connection_pool_dalli
-          - active_support_redis_cache_store
-          - active_support_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
+          - active_support_6_redis_cache_store
+          - active_support_6_redis_cache_store_pooled
+          - active_support_5_redis_cache_store
+          - active_support_5_redis_cache_store_pooled
           - redis_store
         exclude:
           - gemfile: rack_1
             ruby: 3.2.2
           - gemfile: rails_5_2
             ruby: 3.2.2
+<<<<<<< HEAD
+=======
+          - gemfile: active_support_5_redis_cache_store
+            ruby: 3.2.2
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: 3.2.2
+          - gemfile: rails_4_2
+            ruby: 3.2.2
+>>>>>>> main
           - gemfile: dalli2
             ruby: 3.2.2
           - gemfile: rack_1
             ruby: 3.1.4
           - gemfile: rails_5_2
             ruby: 3.1.4
+<<<<<<< HEAD
+=======
+          - gemfile: active_support_5_redis_cache_store
+            ruby: 3.1.4
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: 3.1.4
+          - gemfile: rails_4_2
+            ruby: 3.1.4
+>>>>>>> main
           - gemfile: dalli2
             ruby: 3.1.4
           - gemfile: rack_1
             ruby: 3.0.6
           - gemfile: rails_5_2
             ruby: 3.0.6
+<<<<<<< HEAD
+=======
+          - gemfile: active_support_5_redis_cache_store
+            ruby: 3.0.6
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: 3.0.6
+          - gemfile: rails_4_2
+            ruby: 3.0.6
+>>>>>>> main
           - gemfile: dalli2
             ruby: 3.0.6
           - gemfile: rack_1
@@ -65,10 +98,26 @@ jobs:
             ruby: 2.6.10
           - gemfile: rails_7_0
             ruby: 2.5.8
+          - gemfile: active_support_7_0_redis_cache_store
+            ruby: 2.5.8
+          - gemfile: active_support_7_0_redis_cache_store
+            ruby: 2.6.10
+          - gemfile: active_support_7_0_redis_cache_store_pooled
+            ruby: 2.5.8
+          - gemfile: active_support_7_0_redis_cache_store_pooled
+            ruby: 2.6.10
           - gemfile: rails_7_1
             ruby: 2.6.10
           - gemfile: rails_7_1
             ruby: 2.5.8
+          - gemfile: active_support_7_1_redis_cache_store
+            ruby: 2.5.8
+          - gemfile: active_support_7_1_redis_cache_store
+            ruby: 2.6.10
+          - gemfile: active_support_7_1_redis_cache_store_pooled
+            ruby: 2.5.8
+          - gemfile: active_support_7_1_redis_cache_store_pooled
+            ruby: 2.6.10
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

diff --git a/Appraisals b/Appraisals
@@ -62,17 +62,50 @@ appraise "connection_pool_dalli" do
   gem "dalli", "~> 3.0"
 end
 
-appraise "active_support_redis_cache_store" do
+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 "active_support_6_redis_cache_store" do
   gem "activesupport", "~> 6.1.0"
   gem "redis", "~> 5.0"
 end
 
-appraise "active_support_redis_cache_store_pooled" do
+appraise "active_support_6_redis_cache_store_pooled" do
   gem "activesupport", "~> 6.1.0"
   gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
+appraise "active_support_5_redis_cache_store" do
+  gem "activesupport", "~> 5.2.0"
+  gem "redis", "~> 5.0"
+end
+
+appraise "active_support_5_redis_cache_store_pooled" do
+  gem "activesupport", "~> 5.2.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_5_redis_cache_store.gemfile b/gemfiles/active_support_5_redis_cache_store.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.0"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/active_support_5_redis_cache_store_pooled.gemfile b/gemfiles/active_support_5_redis_cache_store_pooled.gemfile
@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.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/.../active_support_redis_cache_store.gemfile → ...ctive_support_6_redis_cache_store.gemfile b/.../active_support_redis_cache_store.gemfile → ...ctive_support_6_redis_cache_store.gemfile
@@ -5,4 +5,9 @@ source "https://rubygems.org"
 gem "activesupport", "~> 6.1.0"
 gem "redis", "~> 5.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/..._support_redis_cache_store_pooled.gemfile → ...upport_6_redis_cache_store_pooled.gemfile b/..._support_redis_cache_store_pooled.gemfile → ...upport_6_redis_cache_store_pooled.gemfile
@@ -6,4 +6,9 @@ gem "activesupport", "~> 6.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_0_redis_cache_store.gemfile b/gemfiles/active_support_7_0_redis_cache_store.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile b/gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile
@@ -0,0 +1,14 @@
+# 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.gemfile b/gemfiles/active_support_7_1_redis_cache_store.gemfile
@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.1.0"
+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
@@ -0,0 +1,14 @@
+# 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/connection_pool_dalli.gemfile b/gemfiles/connection_pool_dalli.gemfile
@@ -5,4 +5,9 @@ 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/gemfiles/dalli2.gemfile b/gemfiles/dalli2.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "dalli", "~> 2.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/dalli3.gemfile b/gemfiles/dalli3.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "dalli", "~> 3.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rack_1.gemfile b/gemfiles/rack_1.gemfile
@@ -7,4 +7,9 @@ gem "activesupport", ">= 4.2"
 gem "rack", "~> 1.6"
 gem "rack-test", ">= 0.6"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rack_2.gemfile b/gemfiles/rack_2.gemfile
@@ -3,6 +3,10 @@
 source "https://rubygems.org"
 
 gem "rack", "~> 2.0"
-gem "railties"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
 
 gemspec path: "../"
diff --git a/gemfiles/rack_3.gemfile b/gemfiles/rack_3.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "rack", "~> 3.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "railties", "~> 5.2.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "railties", "~> 6.0.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "railties", "~> 6.1.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "railties", "~> 7.0.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "railties", "~> 7.1.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/redis_4.gemfile b/gemfiles/redis_4.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "redis", "~> 4.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/redis_5.gemfile b/gemfiles/redis_5.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "redis", "~> 5.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"
diff --git a/gemfiles/redis_store.gemfile b/gemfiles/redis_store.gemfile
@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "redis-store", "~> 1.5"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"