Skip to content

Commit c7dbb01

Browse files
authored
Merge pull request #1223 from collectiveidea/dg/rails-8
Rails 8
2 parents fc3dfda + 79b8625 commit c7dbb01

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: ['3.1', '3.2', '3.3', jruby-9.4, jruby-head, ruby-head]
16+
ruby: ['3.2', '3.3', jruby-9.4, jruby-head, ruby-head]
1717
rails_version:
1818
- '7.0.0'
1919
- '7.1.0'
2020
- '7.2.0'
21+
- '8.0.0'
2122
- 'edge'
2223
ubuntu: [latest]
2324
include:
@@ -29,6 +30,17 @@ jobs:
2930
rails_version: '6.1.0'
3031
ubuntu: '20.04'
3132

33+
# ruby 3.1 (Dropped by Rails 8)
34+
- ruby: 3.1
35+
rails_version: '7.0.0'
36+
ubuntu: 'latest'
37+
- ruby: 3.1
38+
rails_version: '7.1.0'
39+
ubuntu: 'latest'
40+
- ruby: 3.1
41+
rails_version: '7.2.0'
42+
ubuntu: 'latest'
43+
3244
# jruby-9.2
3345
- ruby: jruby-9.2
3446
rails_version: '6.0.0'

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ platforms :jruby do
3838
elsif ENV['RAILS_VERSION']
3939
gem 'railties', "~> #{ENV['RAILS_VERSION']}"
4040
else
41-
gem 'railties', ['>= 3.0', '< 8.0']
41+
gem 'railties', ['>= 3.0', '< 9.0']
4242
end
4343
end
4444

@@ -59,8 +59,8 @@ group :test do
5959
gem 'rails-html-sanitizer', '< 1.4.0'
6060
end
6161
else
62-
gem 'actionmailer', ['>= 3.0', '< 8.0']
63-
gem 'activerecord', ['>= 3.0', '< 8.0']
62+
gem 'actionmailer', ['>= 3.0', '< 9.0']
63+
gem 'activerecord', ['>= 3.0', '< 9.0']
6464
end
6565
gem 'net-smtp' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
6666
gem 'rspec', '>= 3'

delayed_job.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- encoding: utf-8 -*-
22

33
Gem::Specification.new do |spec|
4-
spec.add_dependency 'activesupport', ['>= 3.0', '< 8.0']
4+
spec.add_dependency 'activesupport', ['>= 3.0', '< 9.0']
55
spec.authors = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke']
66
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.'
77
spec.email = ['brian@collectiveidea.com']

0 commit comments

Comments
 (0)