diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95b275ff..332ffeef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,21 +24,20 @@ jobs: - '3.1' - '3.0' - '2.7' - - '2.6' - - '2.5' gemfile: - rack_3 - rack_2 + - rails_8_1 - rails_8_0 - rails_7_2 - rails_7_1 - rails_7_0 - - rails_6_1 - - rails_6_0 - 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 @@ -47,102 +46,62 @@ jobs: - 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 - redis_store exclude: - - gemfile: rails_6_0 - ruby: '3.4' - - gemfile: active_support_6_redis_cache_store - ruby: '3.4' - - gemfile: active_support_6_redis_cache_store_pooled - ruby: '3.4' - - gemfile: rails_6_1 - ruby: '3.4' - gemfile: rails_7_0 ruby: '3.4' - - gemfile: rails_7_0 - ruby: '2.6' - - gemfile: rails_7_0 - ruby: '2.5' - gemfile: active_support_7_0_redis_cache_store ruby: '3.4' - - gemfile: active_support_7_0_redis_cache_store - ruby: '2.6' - - gemfile: active_support_7_0_redis_cache_store - ruby: '2.5' - gemfile: active_support_7_0_redis_cache_store_pooled ruby: '3.4' - - gemfile: active_support_7_0_redis_cache_store_pooled - ruby: '2.6' - - gemfile: active_support_7_0_redis_cache_store_pooled - ruby: '2.5' - - gemfile: rails_7_1 - ruby: '2.6' - - gemfile: rails_7_1 - ruby: '2.5' - - gemfile: active_support_7_1_redis_cache_store - ruby: '2.6' - - gemfile: active_support_7_1_redis_cache_store - ruby: '2.5' - - gemfile: active_support_7_1_redis_cache_store_pooled - ruby: '2.6' - - gemfile: active_support_7_1_redis_cache_store_pooled - ruby: '2.5' - gemfile: rails_7_2 ruby: '3.0' - gemfile: rails_7_2 ruby: '2.7' - - gemfile: rails_7_2 - ruby: '2.6' - - gemfile: rails_7_2 - ruby: '2.5' - gemfile: active_support_7_2_redis_cache_store ruby: '3.0' - gemfile: active_support_7_2_redis_cache_store ruby: '2.7' - - gemfile: active_support_7_2_redis_cache_store - ruby: '2.6' - - gemfile: active_support_7_2_redis_cache_store - ruby: '2.5' - 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: active_support_7_2_redis_cache_store_pooled - ruby: '2.6' - - gemfile: active_support_7_2_redis_cache_store_pooled - ruby: '2.5' - gemfile: rails_8_0 ruby: '3.1' - gemfile: rails_8_0 ruby: '3.0' - gemfile: rails_8_0 ruby: '2.7' - - gemfile: rails_8_0 - ruby: '2.6' - - gemfile: rails_8_0 - ruby: '2.5' - gemfile: active_support_8_0_redis_cache_store ruby: '3.1' - gemfile: active_support_8_0_redis_cache_store ruby: '3.0' - gemfile: active_support_8_0_redis_cache_store ruby: '2.7' - - gemfile: active_support_8_0_redis_cache_store - ruby: '2.6' - - gemfile: active_support_8_0_redis_cache_store - ruby: '2.5' - 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: active_support_8_0_redis_cache_store_pooled - ruby: '2.6' - - gemfile: active_support_8_0_redis_cache_store_pooled - ruby: '2.5' + - gemfile: rails_8_1 + ruby: '3.1' + - gemfile: rails_8_1 + ruby: '3.0' + - gemfile: rails_8_1 + ruby: '2.7' + - gemfile: active_support_8_1_redis_cache_store + ruby: '3.1' + - gemfile: active_support_8_1_redis_cache_store + 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 1d978867..696ba67f 100644 --- a/Appraisals +++ b/Appraisals @@ -8,6 +8,10 @@ appraise "rack_2" do gem "rack", "~> 2.0" end +appraise 'rails_8-1' do + gem 'railties', '~> 8.1.0' +end + appraise 'rails_8-0' do gem 'railties', '~> 8.0.0' end @@ -24,14 +28,6 @@ appraise 'rails_7-0' do gem 'railties', '~> 7.0.0' end -appraise 'rails_6-1' do - gem 'railties', '~> 6.1.0' -end - -appraise 'rails_6-0' do - gem 'railties', '~> 6.0.0' -end - appraise 'dalli3' do gem 'dalli', '~> 3.0' end @@ -49,6 +45,17 @@ appraise "connection_pool_dalli" do gem "dalli", "~> 3.0" end +appraise "active_support_8-1_redis_cache_store" do + gem "activesupport", "~> 8.1.0" + 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" @@ -93,17 +100,6 @@ appraise "active_support_7-0_redis_cache_store_pooled" do 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_6_redis_cache_store_pooled" do - gem "activesupport", "~> 6.1.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_6_redis_cache_store.gemfile b/gemfiles/active_support_8_1_redis_cache_store.gemfile similarity index 85% rename from gemfiles/active_support_6_redis_cache_store.gemfile rename to gemfiles/active_support_8_1_redis_cache_store.gemfile index 72fb5b1d..57e0ff21 100644 --- a/gemfiles/active_support_6_redis_cache_store.gemfile +++ b/gemfiles/active_support_8_1_redis_cache_store.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "activesupport", "~> 6.1.0" +gem "activesupport", "~> 8.1.0" gem "redis", "~> 5.0" group :maintenance, optional: true do diff --git a/gemfiles/active_support_6_redis_cache_store_pooled.gemfile b/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile similarity index 87% rename from gemfiles/active_support_6_redis_cache_store_pooled.gemfile rename to gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile index 36a40f57..6e49595b 100644 --- a/gemfiles/active_support_6_redis_cache_store_pooled.gemfile +++ b/gemfiles/active_support_8_1_redis_cache_store_pooled.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "activesupport", "~> 6.1.0" +gem "activesupport", "~> 8.1.0" gem "connection_pool", "~> 2.2" gem "redis", "~> 5.0" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index b1e5c039..00000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -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_6_0.gemfile b/gemfiles/rails_8_1.gemfile similarity index 85% rename from gemfiles/rails_6_0.gemfile rename to gemfiles/rails_8_1.gemfile index 679fea78..92df38d6 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_8_1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "railties", "~> 6.0.0" +gem "railties", "~> 8.1.0" group :maintenance, optional: true do gem "bake"