From 070e467ef220a4566abed7dc4c64c278d66b812f Mon Sep 17 00:00:00 2001 From: Santiago Bartesaghi Date: Tue, 24 Oct 2023 19:14:27 -0300 Subject: [PATCH 1/2] ci: test against ActiveSupport::RedisCacheStore v5 (#632) --- .github/workflows/build.yml | 14 ++++++++++++++ Appraisals | 11 +++++++++++ .../active_support_5_redis_cache_store.gemfile | 13 +++++++++++++ ...tive_support_5_redis_cache_store_pooled.gemfile | 14 ++++++++++++++ gemfiles/active_support_redis_cache_store.gemfile | 5 +++++ ...active_support_redis_cache_store_pooled.gemfile | 5 +++++ gemfiles/connection_pool_dalli.gemfile | 5 +++++ gemfiles/dalli2.gemfile | 5 +++++ gemfiles/dalli3.gemfile | 5 +++++ gemfiles/rack_1.gemfile | 5 +++++ gemfiles/rack_2.gemfile | 6 +++++- gemfiles/rack_3.gemfile | 5 +++++ gemfiles/rails_4_2.gemfile | 5 +++++ gemfiles/rails_5_2.gemfile | 5 +++++ gemfiles/rails_6_0.gemfile | 5 +++++ gemfiles/rails_6_1.gemfile | 5 +++++ gemfiles/rails_7_0.gemfile | 5 +++++ gemfiles/rails_7_1.gemfile | 5 +++++ gemfiles/redis_4.gemfile | 5 +++++ gemfiles/redis_5.gemfile | 5 +++++ gemfiles/redis_store.gemfile | 5 +++++ 21 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 gemfiles/active_support_5_redis_cache_store.gemfile create mode 100644 gemfiles/active_support_5_redis_cache_store_pooled.gemfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46d67464..6ca20631 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,12 +40,18 @@ jobs: - connection_pool_dalli - active_support_redis_cache_store - active_support_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 + - 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 - gemfile: dalli2 @@ -54,6 +60,10 @@ jobs: ruby: 3.1.4 - gemfile: rails_5_2 ruby: 3.1.4 + - 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 - gemfile: dalli2 @@ -62,6 +72,10 @@ jobs: ruby: 3.0.6 - gemfile: rails_5_2 ruby: 3.0.6 + - 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 - gemfile: dalli2 diff --git a/Appraisals b/Appraisals index fe499170..89062b53 100644 --- a/Appraisals +++ b/Appraisals @@ -81,6 +81,17 @@ appraise "active_support_redis_cache_store_pooled" do 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 new file mode 100644 index 00000000..0b800a0f --- /dev/null +++ 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 new file mode 100644 index 00000000..9127da50 --- /dev/null +++ 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/gemfiles/active_support_redis_cache_store.gemfile b/gemfiles/active_support_redis_cache_store.gemfile index 21a16e7d..72fb5b1d 100644 --- a/gemfiles/active_support_redis_cache_store.gemfile +++ b/gemfiles/active_support_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/gemfiles/active_support_redis_cache_store_pooled.gemfile b/gemfiles/active_support_redis_cache_store_pooled.gemfile index f74738f2..36a40f57 100644 --- a/gemfiles/active_support_redis_cache_store_pooled.gemfile +++ b/gemfiles/active_support_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/connection_pool_dalli.gemfile b/gemfiles/connection_pool_dalli.gemfile index 67c69a59..f84eb52e 100644 --- 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 index c47d5afa..eb7e4acb 100644 --- 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 index 5f4d073b..3873dedf 100644 --- 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 index 2390b859..36b2f91b 100644 --- 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 index 41b64ab4..246c981a 100644 --- 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 index 24e3a766..f0735014 100644 --- 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_4_2.gemfile b/gemfiles/rails_4_2.gemfile index 055cf9f6..4209e6dc 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -5,4 +5,9 @@ source "https://rubygems.org" gem "railties", "~> 4.2.0" gem "rack-test", ">= 0.6" +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 index 8b2627fc..161bb698 100644 --- 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 index 4cd55a81..679fea78 100644 --- 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 index 4c467fec..b1e5c039 100644 --- 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 index 495c72d0..6f490fff 100644 --- 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 index 036d9836..fdfb546f 100644 --- 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 index 701e936c..e8b82f16 100644 --- 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 index 0aac1021..fc9b4655 100644 --- 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 index 8aafc6d1..e32d1e9e 100644 --- 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: "../" From c7098d610b7ba5e2f868eac4d9425889095a5611 Mon Sep 17 00:00:00 2001 From: Santiago Bartesaghi Date: Wed, 25 Oct 2023 21:15:53 -0300 Subject: [PATCH 2/2] ci: improve ActiveSupport testing (#633) --- .github/workflows/build.yml | 24 +++++++++++++++-- Appraisals | 26 +++++++++++++++++-- ...ctive_support_6_redis_cache_store.gemfile} | 0 ...upport_6_redis_cache_store_pooled.gemfile} | 0 ...tive_support_7_0_redis_cache_store.gemfile | 13 ++++++++++ ...pport_7_0_redis_cache_store_pooled.gemfile | 14 ++++++++++ ...tive_support_7_1_redis_cache_store.gemfile | 13 ++++++++++ ...pport_7_1_redis_cache_store_pooled.gemfile | 14 ++++++++++ 8 files changed, 100 insertions(+), 4 deletions(-) rename gemfiles/{active_support_redis_cache_store.gemfile => active_support_6_redis_cache_store.gemfile} (100%) rename gemfiles/{active_support_redis_cache_store_pooled.gemfile => active_support_6_redis_cache_store_pooled.gemfile} (100%) create mode 100644 gemfiles/active_support_7_0_redis_cache_store.gemfile create mode 100644 gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile create mode 100644 gemfiles/active_support_7_1_redis_cache_store.gemfile create mode 100644 gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ca20631..cc3200cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,8 +38,12 @@ 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 @@ -88,10 +92,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 index 89062b53..185740dc 100644 --- a/Appraisals +++ b/Appraisals @@ -70,12 +70,34 @@ 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" diff --git a/gemfiles/active_support_redis_cache_store.gemfile b/gemfiles/active_support_6_redis_cache_store.gemfile similarity index 100% rename from gemfiles/active_support_redis_cache_store.gemfile rename to gemfiles/active_support_6_redis_cache_store.gemfile diff --git a/gemfiles/active_support_redis_cache_store_pooled.gemfile b/gemfiles/active_support_6_redis_cache_store_pooled.gemfile similarity index 100% rename from gemfiles/active_support_redis_cache_store_pooled.gemfile rename to gemfiles/active_support_6_redis_cache_store_pooled.gemfile diff --git a/gemfiles/active_support_7_0_redis_cache_store.gemfile b/gemfiles/active_support_7_0_redis_cache_store.gemfile new file mode 100644 index 00000000..a94cfe88 --- /dev/null +++ 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 new file mode 100644 index 00000000..bd2a6e71 --- /dev/null +++ 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 new file mode 100644 index 00000000..a0602ba5 --- /dev/null +++ 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 new file mode 100644 index 00000000..ae2d6d96 --- /dev/null +++ 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: "../"