From 40c4c307dd7f94f8ef862007c5f6d8e5311823a1 Mon Sep 17 00:00:00 2001 From: Brad Lindsay Date: Sun, 20 Sep 2026 18:24:33 -0500 Subject: [PATCH 1/2] Add Rails 8.1 and Ruby 4.0 to matrix of support --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 5 +++++ scrapbook.gemspec | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1729d18..3de66f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,8 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - ruby-version: ['3.2', '3.3', '3.4'] - rails-version: ['7.2', '8.0'] + ruby-version: ['3.2', '3.3', '3.4', '4.0'] + rails-version: ['7.2', '8.0', '8.1'] runs-on: ${{ matrix.os }} env: RAILS_VERSION: "${{ matrix.rails-version }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5662539..5780cf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ may consider to be a bug might be behavior a consumer relies upon in their proje ## Unreleased +### Added + +- Added support for Rails 8.1. +- Added support for Ruby 4.0. + [Unreleased commits](https://github.com/bfad/scrapbook/compare/v0.4.0...HEAD) ## 0.4.0 diff --git a/scrapbook.gemspec b/scrapbook.gemspec index f81603d..87c1cee 100644 --- a/scrapbook.gemspec +++ b/scrapbook.gemspec @@ -22,5 +22,5 @@ Gem::Specification.new do |spec| end spec.required_ruby_version = '>= 2.7.0' - spec.add_dependency 'rails', '>= 6.1', '< 8.1' + spec.add_dependency 'rails', '>= 6.1', '< 8.2' end From 500e1f14557e1d385822e0561052fa2e2bce79d7 Mon Sep 17 00:00:00 2001 From: Brad Lindsay Date: Sun, 20 Sep 2026 18:35:52 -0500 Subject: [PATCH 2/2] Pin Rubocop version Whenever a new version of Rubocop gets released, all of a sudden the lint CI task starts failing as cops have changed or been added that cause our existing code to fail. This is because CI just isntalls the latest version our Gemfile allows (we don't check-in the Gemfile.lock). This should solve the issue by pinning it in the Gemfile. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a83a604..b3a538f 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'rails-controller-testing' gem 'rspec' gem 'rspec-rails' -gem 'rubocop', '~> 1.26', require: false +gem 'rubocop', '1.52.1', require: false gem 'rubocop-performance', require: false gem 'rubocop-rails', require: false gem 'rubocop-rspec', require: false