From ba3e26c0894d72dc9b70cdfe8f54feb367004d5e Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:12:17 +0200 Subject: [PATCH 1/7] Remove action support for ruby < 2.3 --- .github/workflows/ruby.yml | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 896994e..a4b2b31 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,31 +19,11 @@ jobs: strategy: matrix: - ruby-version: ['1.9', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2'] + ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2'] rails-version: ['4.2', '5.0', '5.1', '6.0', '6.1', '7.0'] exclude: - # Segmentation faults during tests, but should work? - - ruby-version: '2.2' - rails-version: '5.0' - - ruby-version: '2.2' - rails-version: '5.1' - # Too old - - ruby-version: '1.9' - rails-version: '5.0' - - ruby-version: '1.9' - rails-version: '5.1' - - ruby-version: '1.9' - rails-version: '6.0' - - ruby-version: '1.9' - rails-version: '6.1' - - ruby-version: '1.9' - rails-version: '7.0' # activesupport (~> 6.0.0) was resolved to 6.0.6.1, which depends on ruby (>= 2.5.0) # activesupport (~> 6.1.0) was resolved to 6.1.7.2, which depends on ruby (>= 2.5.0) - - ruby-version: '2.2' - rails-version: '6.0' - - ruby-version: '2.2' - rails-version: '6.1' - ruby-version: '2.3' rails-version: '6.0' - ruby-version: '2.3' @@ -53,8 +33,8 @@ jobs: - ruby-version: '2.4' rails-version: '6.1' # activesupport (~> 7.0.0) was resolved to 7.0.4.2, which depends on Ruby (>= 2.7.0) - - ruby-version: '2.2' - rails-version: '7.0' + # - ruby-version: '2.2' + # rails-version: '7.0' - ruby-version: '2.3' rails-version: '7.0' - ruby-version: '2.4' From 3c0e879cee6c1cf95290bec1836627fa9655dcd0 Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:12:28 +0200 Subject: [PATCH 2/7] bump to 8.0.0 --- lib/cached_resource/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cached_resource/version.rb b/lib/cached_resource/version.rb index 96edc94..3325b48 100644 --- a/lib/cached_resource/version.rb +++ b/lib/cached_resource/version.rb @@ -1,3 +1,3 @@ module CachedResource - VERSION = "7.2.0" + VERSION = "8.0.0" end From 4c0093c3c603abb15b06dbb7fc105304c8683b1a Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:20:56 +0200 Subject: [PATCH 3/7] Add support for ruby 3.3, rails 7.1 --- .github/workflows/ruby.yml | 6 +++--- Gemfile | 2 ++ gemfiles/7.1.gemfile | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 gemfiles/7.1.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index a4b2b31..de35db1 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,8 +19,8 @@ jobs: strategy: matrix: - ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2'] - rails-version: ['4.2', '5.0', '5.1', '6.0', '6.1', '7.0'] + ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3'] + rails-version: ['4.2', '5.0', '5.1', '6.0', '6.1', '7.0', '7.1'] exclude: # activesupport (~> 6.0.0) was resolved to 6.0.6.1, which depends on ruby (>= 2.5.0) # activesupport (~> 6.1.0) was resolved to 6.1.7.2, which depends on ruby (>= 2.5.0) @@ -69,7 +69,7 @@ jobs: rails-version: '5.1' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby ${{ matrix.ruby-version }} # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): diff --git a/Gemfile b/Gemfile index 6c033d1..41ee41e 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,8 @@ when "6.1" eval_gemfile('../gemfiles/6.1.gemfile') when "7.0" eval_gemfile('../gemfiles/7.0.gemfile') +when "7.1" + eval_gemfile('../gemfiles/7.1.gemfile') else puts "\e[93mNo TEST_RAILS_VERSION present, letting dependency manager decide what's best.\e[0m" if ENV['DEBUG'] end diff --git a/gemfiles/7.1.gemfile b/gemfiles/7.1.gemfile new file mode 100644 index 0000000..d8951c0 --- /dev/null +++ b/gemfiles/7.1.gemfile @@ -0,0 +1,3 @@ +source "http://rubygems.org" + +gem "rails", "~> 7.1.0" From 2db2c664d7c54c75253741eb3e1a18ddfdd6682b Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:24:03 +0200 Subject: [PATCH 4/7] Update action matrix with rails 7.1 compat --- .github/workflows/ruby.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index de35db1..2a04d3d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -67,6 +67,15 @@ jobs: rails-version: '5.0' - ruby-version: '3.2' rails-version: '5.1' + # rails (~> 7.1.0) was resolved to 7.1.3.2, which depends on Ruby (>= 2.7.0) + - ruby-version: '2.3' + rails-version: '7.1' + - ruby-version: '2.4' + rails-version: '7.1' + - ruby-version: '2.5' + rails-version: '7.1' + - ruby-version: '2.6' + rails-version: '7.1' steps: - uses: actions/checkout@v4 From bfa61baee26e2c7067f537c14ba3dab789da7d40 Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:27:08 +0200 Subject: [PATCH 5/7] Update ruby compat matrix --- .github/workflows/ruby.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 2a04d3d..75f9360 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -76,6 +76,13 @@ jobs: rails-version: '7.1' - ruby-version: '2.6' rails-version: '7.1' + # Because rails >= 4.0.0.beta1, < 5.0.5.rc1 depends on bundler >= 1.3.0, < 2.0 + # and the current Bundler version (2.5.9) does not satisfy bundler >= 1.3.0, < 2.0, + # rails >= 4.0.0.beta1, < 5.0.5.rc1 cannot be used. + # So, because Gemfile depends on rails ~> 4.2.0, + # version solving has failed. + - ruby-version: '3.3' + rails-version: '4.2' steps: - uses: actions/checkout@v4 From 9935de79a704ce68002a210b42e2706d93e98ae0 Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:32:03 +0200 Subject: [PATCH 6/7] Update README according to action results --- README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ea584b0..5f0f59e 100644 --- a/README.md +++ b/README.md @@ -12,18 +12,17 @@ gem install cached_resource CachedResource is designed to be framework agnostic, but will hook into Rails for caching and logging if available. CachedResource supports the following ActiveSupport/Rails (right) and Ruby (down) version combinations: -| | 🛤️ 4.2 | 🛤️ 5.0 | 🛤️ 5.1 | 🛤️ 6.0 | 🛤️ 6.1 | 🛤️ 7.0 | -|-------|-----|-----|-----|-----|-----|-----| -| 💎 1.9 | ✅ | | | | | | -| 💎 2.2 | ✅ | | | | | | -| 💎 2.3 | ✅ | ✅ | ✅ | | | | -| 💎 2.4 | ✅ | ✅ | ✅ | | | | -| 💎 2.5 | ✅ | ✅ | ✅ | ✅ | ✅ | | -| 💎 2.6 | ✅ | ✅ | ✅ | ✅ | ✅ | | -| 💎 2.7 | | ✅ | ✅ | ✅ | ✅ | ✅ | -| 💎 3.0 | | | | ✅ | ✅ | ✅ | -| 💎 3.1 | | | | ✅ | ✅ | ✅ | -| 💎 3.2 | | | | ✅ | ✅ | ✅ | +| | 🛤️ 4.2 | 🛤️ 5.0 | 🛤️ 5.1 | 🛤️ 6.0 | 🛤️ 6.1 | 🛤️ 7.0 | 🛤️ 7.1 | +|-------|-----|-----|-----|-----|-----|-----|-----| +| 💎 2.3 | ✅ | ✅ | ✅ | | | | | +| 💎 2.4 | ✅ | ✅ | ✅ | | | | | +| 💎 2.5 | ✅ | ✅ | ✅ | ✅ | ✅ | | | +| 💎 2.6 | ✅ | ✅ | ✅ | ✅ | ✅ | | +| 💎 2.7 | | ✅ | ✅ | ✅ | ✅ | ✅ |✅ | +| 💎 3.0 | | | | ✅ | ✅ | ✅ | ✅ | +| 💎 3.1 | | | | ✅ | ✅ | ✅ | ✅ | +| 💎 3.2 | | | | ✅ | ✅ | ✅ | ✅ | +| 💎 3.3 | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ## Limitations From e7a57a31fdd24144a6b619cc3526b9a7e71f3b6b Mon Sep 17 00:00:00 2001 From: Morgan Brown Date: Wed, 8 May 2024 11:34:43 +0200 Subject: [PATCH 7/7] Remove commented out code --- .github/workflows/ruby.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 75f9360..bc101b9 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -33,8 +33,6 @@ jobs: - ruby-version: '2.4' rails-version: '6.1' # activesupport (~> 7.0.0) was resolved to 7.0.4.2, which depends on Ruby (>= 2.7.0) - # - ruby-version: '2.2' - # rails-version: '7.0' - ruby-version: '2.3' rails-version: '7.0' - ruby-version: '2.4'