Skip to content

Commit

Permalink
Merge pull request #242 from collectiveidea/dg/rails-8
Browse files Browse the repository at this point in the history
Rails 8
  • Loading branch information
albus522 authored Nov 9, 2024
2 parents a264ba1 + 5a32aa8 commit b863ef0
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['3.1', '3.2', '3.3', 'head', 'jruby-9.4', 'jruby-head']
ruby: ['3.2', '3.3', 'head', 'jruby-9.4', 'jruby-head']
gemfile:
- gemfiles/postgresql/master.gemfile
- gemfiles/mysql2/master.gemfile
Expand Down
30 changes: 29 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ['3.1', '3.2', '3.3']
ruby: ['3.2', '3.3']
gemfile:
- gemfiles/mysql2/7-1.gemfile
- gemfiles/postgresql/7-1.gemfile
Expand All @@ -23,6 +23,10 @@ jobs:
- gemfiles/postgresql/7-2.gemfile
- gemfiles/sqlite3/7-2.gemfile
- gemfiles/trilogy/7-2.gemfile
- gemfiles/mysql2/8-0.gemfile
- gemfiles/postgresql/8-0.gemfile
- gemfiles/sqlite3/8-0.gemfile
- gemfiles/trilogy/8-0.gemfile
ubuntu: ['latest']
include:
#
Expand Down Expand Up @@ -52,6 +56,30 @@ jobs:
- ruby: '3.0'
gemfile: gemfiles/trilogy/7-1.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/mysql2/7-1.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/postgresql/7-1.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/sqlite3/7-1.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/trilogy/7-1.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/mysql2/7-2.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/postgresql/7-2.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/sqlite3/7-2.gemfile
ubuntu: latest
- ruby: '3.1'
gemfile: gemfiles/trilogy/7-2.gemfile
ubuntu: latest


#
Expand Down
2 changes: 1 addition & 1 deletion delayed_job_active_record.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ Gem::Specification.new do |spec|

spec.metadata = { "rubygems_mfa_required" => "true" }

spec.add_dependency "activerecord", [">= 3.0", "< 8.0"]
spec.add_dependency "activerecord", [">= 3.0", "< 9.0"]
spec.add_dependency "delayed_job", [">= 3.0", "< 5"]
end
23 changes: 23 additions & 0 deletions gemfiles/mysql2/8-0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcmysql-adapter"
end

platforms :ruby, :mswin, :mingw do
gem "mysql2", "~> 0.5"
end

gem "rspec", ">= 2.11"
gem "simplecov", ">= 0.20.0", require: false
gem "simplecov-lcov", ">= 0.8.0", require: false

gem "activerecord", "~> 8.0.0"
end

gemspec path: "../../"
23 changes: 23 additions & 0 deletions gemfiles/postgresql/8-0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcmysql-adapter"
end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 1.1"
end

gem "rspec", ">= 2.11"
gem "simplecov", ">= 0.20.0", require: false
gem "simplecov-lcov", ">= 0.8.0", require: false

gem "activerecord", "~> 8.0.0"
end

gemspec path: "../../"
23 changes: 23 additions & 0 deletions gemfiles/sqlite3/8-0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcmysql-adapter"
end

platforms :ruby, :mswin, :mingw do
gem "sqlite3", ">= 1.4"
end

gem "rspec", ">= 2.11"
gem "simplecov", ">= 0.20.0", require: false
gem "simplecov-lcov", ">= 0.8.0", require: false

gem "activerecord", "~> 8.0.0"
end

gemspec path: "../../"
2 changes: 1 addition & 1 deletion gemfiles/sqlite3/master.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ group :test do
end

platforms :ruby, :mswin, :mingw do
gem "sqlite3", "~> 1.4"
gem "sqlite3", ">= 2.1"
end

gem "rspec", ">= 2.11"
Expand Down
19 changes: 19 additions & 0 deletions gemfiles/trilogy/8-0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :ruby, :mswin, :mingw do
gem "trilogy", "~> 2.7"
end

gem "rspec", ">= 2.11"
gem "simplecov", ">= 0.20.0", require: false
gem "simplecov-lcov", ">= 0.8.0", require: false

gem "activerecord", "~> 8.0.0"
end

gemspec path: "../../"

0 comments on commit b863ef0

Please sign in to comment.