Skip to content

Commit

Permalink
Merge pull request #1223 from collectiveidea/dg/rails-8
Browse files Browse the repository at this point in the history
Rails 8
  • Loading branch information
albus522 authored Nov 8, 2024
2 parents fc3dfda + 79b8625 commit c7dbb01
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion delayed_job.gemspec
Original file line number Diff line number Diff line change
@@ -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 = ['[email protected]']
Expand Down

0 comments on commit c7dbb01

Please sign in to comment.