From 4ee16777e4f2cbff919c54ed93b2c551bb49837e Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Tue, 21 Oct 2025 15:22:54 +0100 Subject: [PATCH 1/2] Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1 --- .github/workflows/test.yml | 4 ++-- CHANGELOG.md | 3 ++- gemfiles/Gemfile.rails70 | 8 -------- ndr_stats.gemspec | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 gemfiles/Gemfile.rails70 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab6dc19..40a9d3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,13 @@ on: [push] jobs: test: strategy: + fail-fast: false matrix: ruby-version: - - '3.1' - '3.2' - '3.3' + - '3.4' gemfile: - - gemfiles/Gemfile.rails70 - gemfiles/Gemfile.rails71 - gemfiles/Gemfile.rails72 - gemfiles/Gemfile.rails80 diff --git a/CHANGELOG.md b/CHANGELOG.md index c9f8a38..458a2b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] -* no unreleased changes* +### Fixed +* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1 ## 0.2.2 / 2024-11-19 ### Added diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70 deleted file mode 100644 index aba9ab0..0000000 --- a/gemfiles/Gemfile.rails70 +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -gem 'rails', '~> 7.0.0' - -# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260 -gem 'concurrent-ruby', '1.3.4' diff --git a/ndr_stats.gemspec b/ndr_stats.gemspec index 1c31b93..dfa5139 100644 --- a/ndr_stats.gemspec +++ b/ndr_stats.gemspec @@ -33,5 +33,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '>= 12.3.3' # rubocop:enable Gemspec/DevelopmentDependencies - spec.required_ruby_version = '>= 3.1.0' + spec.required_ruby_version = '>= 3.2.0' end From 0c14f703682787cf9a18d602296c984cba12ce77 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Wed, 22 Oct 2025 10:14:02 +0100 Subject: [PATCH 2/2] Support ruby 3.4 --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 81c7841..4380a00 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.0 + ruby-version: 3.4 - name: Install dependencies run: bundle install - name: Run RuboCop against BASE..HEAD changes