From b60e70a20c45a767d9b8ae2ed12630b2f082f887 Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 8 Nov 2024 15:15:31 -0500 Subject: [PATCH 1/2] Enable rails 8 --- Gemfile | 6 +++--- delayed_job.gemspec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ec269986..72280c43 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ platforms :jruby do elsif ENV['RAILS_VERSION'] gem 'railties', "~> #{ENV['RAILS_VERSION']}" else - gem 'railties', ['>= 3.0', '< 8.0'] + gem 'railties', ['>= 3.0', '< 9.0'] end end @@ -59,8 +59,8 @@ group :test do gem 'rails-html-sanitizer', '< 1.4.0' end else - gem 'actionmailer', ['>= 3.0', '< 8.0'] - gem 'activerecord', ['>= 3.0', '< 8.0'] + gem 'actionmailer', ['>= 3.0', '< 9.0'] + gem 'activerecord', ['>= 3.0', '< 9.0'] end gem 'net-smtp' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0') gem 'rspec', '>= 3' diff --git a/delayed_job.gemspec b/delayed_job.gemspec index 765079cb..b52026ef 100644 --- a/delayed_job.gemspec +++ b/delayed_job.gemspec @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |spec| - spec.add_dependency 'activesupport', ['>= 3.0', '< 8.0'] + spec.add_dependency 'activesupport', ['>= 3.0', '< 9.0'] spec.authors = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke'] spec.description = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.' spec.email = ['brian@collectiveidea.com'] From 79b86255cfcbade2473f1528c173cfd237b88d8c Mon Sep 17 00:00:00 2001 From: David Genord II Date: Fri, 8 Nov 2024 15:21:33 -0500 Subject: [PATCH 2/2] Update matrix for Rails 8 --- .github/workflows/ci.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93536aa3..43bf8912 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,12 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['3.1', '3.2', '3.3', jruby-9.4, jruby-head, ruby-head] + ruby: ['3.2', '3.3', jruby-9.4, jruby-head, ruby-head] rails_version: - '7.0.0' - '7.1.0' - '7.2.0' + - '8.0.0' - 'edge' ubuntu: [latest] include: @@ -29,6 +30,17 @@ jobs: rails_version: '6.1.0' ubuntu: '20.04' + # ruby 3.1 (Dropped by Rails 8) + - ruby: 3.1 + rails_version: '7.0.0' + ubuntu: 'latest' + - ruby: 3.1 + rails_version: '7.1.0' + ubuntu: 'latest' + - ruby: 3.1 + rails_version: '7.2.0' + ubuntu: 'latest' + # jruby-9.2 - ruby: jruby-9.2 rails_version: '6.0.0'