diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 0333b255..cb8d1b80 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a2f2adf..1a36a779 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: # @@ -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 # diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec index 3a340f1d..7fd62fbd 100644 --- a/delayed_job_active_record.gemspec +++ b/delayed_job_active_record.gemspec @@ -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 diff --git a/gemfiles/mysql2/8-0.gemfile b/gemfiles/mysql2/8-0.gemfile new file mode 100644 index 00000000..2635f697 --- /dev/null +++ b/gemfiles/mysql2/8-0.gemfile @@ -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: "../../" diff --git a/gemfiles/postgresql/8-0.gemfile b/gemfiles/postgresql/8-0.gemfile new file mode 100644 index 00000000..a724df08 --- /dev/null +++ b/gemfiles/postgresql/8-0.gemfile @@ -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: "../../" diff --git a/gemfiles/sqlite3/8-0.gemfile b/gemfiles/sqlite3/8-0.gemfile new file mode 100644 index 00000000..c03c7533 --- /dev/null +++ b/gemfiles/sqlite3/8-0.gemfile @@ -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: "../../" diff --git a/gemfiles/sqlite3/master.gemfile b/gemfiles/sqlite3/master.gemfile index ba1d78f7..258c87b7 100644 --- a/gemfiles/sqlite3/master.gemfile +++ b/gemfiles/sqlite3/master.gemfile @@ -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" diff --git a/gemfiles/trilogy/8-0.gemfile b/gemfiles/trilogy/8-0.gemfile new file mode 100644 index 00000000..c4968006 --- /dev/null +++ b/gemfiles/trilogy/8-0.gemfile @@ -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: "../../"