diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee406353..602e49af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,52 +7,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.2", "3.1", "3.0", "2.7", "2.6", "2.5", jruby-9.3, ruby-head] - rails: ["7.0", "6.1", "6.0", "5.2", "5.1", "5.0", main] + ruby: ["3.3", "3.2", "3.1", "3.0", "2.7", jruby-9.4, ruby-head] + rails: ["7.2", "7.1", "7.0", "6.1", main] orm: [active_record, mongoid] exclude: - - ruby: 2.5 - rails: "7.0" - - ruby: 2.5 - rails: main - - ruby: 2.6 - rails: "7.0" - - ruby: 2.6 - rails: main - - ruby: jruby-9.3 - rails: "7.0" - - ruby: jruby-9.3 - rails: main - - ruby: "3.0" - rails: "5.0" - - ruby: "3.0" - rails: "5.1" - - ruby: "3.0" - rails: "5.2" - - ruby: "3.1" - rails: "5.0" - - ruby: "3.1" - rails: "5.1" - - ruby: "3.1" - rails: "5.2" - - ruby: "3.1" - rails: "6.0" - - ruby: "3.2" - rails: "5.0" - - ruby: "3.2" - rails: "5.1" - - ruby: "3.2" - rails: "5.2" - - ruby: "3.2" - rails: "6.0" - - ruby: ruby-head - rails: "5.0" - - ruby: ruby-head - rails: "5.1" - - ruby: ruby-head - rails: "5.2" - - ruby: ruby-head - rails: "6.0" - ruby: ruby-head rails: "6.1" - ruby: "3.1" diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 deleted file mode 100644 index ae161594..00000000 --- a/gemfiles/Gemfile.rails-5.0 +++ /dev/null @@ -1,24 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 5.0.pre1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.13' - end - - gem 'actionmailer', '~> 5.0.0' - gem 'activerecord', '~> 5.0.0' - gem 'capybara' - gem 'devise', '~> 4.6' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end diff --git a/gemfiles/Gemfile.rails-5.1 b/gemfiles/Gemfile.rails-5.1 deleted file mode 100644 index 2205d117..00000000 --- a/gemfiles/Gemfile.rails-5.1 +++ /dev/null @@ -1,24 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 51.2' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.13' - end - - gem 'actionmailer', '~> 5.1.0' - gem 'activerecord', '~> 5.1.0' - gem 'capybara' - gem 'devise', '~> 4.6' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end diff --git a/gemfiles/Gemfile.rails-5.2 b/gemfiles/Gemfile.rails-5.2 deleted file mode 100644 index 353323d0..00000000 --- a/gemfiles/Gemfile.rails-5.2 +++ /dev/null @@ -1,24 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.13' - end - - gem 'actionmailer', '~> 5.2.0' - gem 'activerecord', '~> 5.2.0' - gem 'capybara' - gem 'devise', '~> 4.6' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end diff --git a/gemfiles/Gemfile.rails-7.0 b/gemfiles/Gemfile.rails-7.0 index a45356b7..395b5df7 100644 --- a/gemfiles/Gemfile.rails-7.0 +++ b/gemfiles/Gemfile.rails-7.0 @@ -13,7 +13,7 @@ group :test do gem 'actionmailer', '~> 7.0.0' gem 'activerecord', '~> 7.0.0' gem 'capybara' - gem 'devise', '~> 4.8.1' + gem 'devise', '~> 4.8' gem 'mocha' gem 'mongoid' gem 'nokogiri' diff --git a/gemfiles/Gemfile.rails-6.0 b/gemfiles/Gemfile.rails-7.1 similarity index 79% rename from gemfiles/Gemfile.rails-6.0 rename to gemfiles/Gemfile.rails-7.1 index aa9d3466..e0b94161 100644 --- a/gemfiles/Gemfile.rails-6.0 +++ b/gemfiles/Gemfile.rails-7.1 @@ -10,10 +10,10 @@ group :test do gem 'sqlite3', '~> 1.4' end - gem 'actionmailer', '~> 6.0.0' - gem 'activerecord', '~> 6.0.0' + gem 'actionmailer', '~> 7.1.0' + gem 'activerecord', '~> 7.1.0' gem 'capybara' - gem 'devise', '~> 4.6' + gem 'devise', '~> 4.8' gem 'mocha' gem 'mongoid' gem 'nokogiri' diff --git a/gemfiles/Gemfile.rails-7.2 b/gemfiles/Gemfile.rails-7.2 new file mode 100644 index 00000000..262f7763 --- /dev/null +++ b/gemfiles/Gemfile.rails-7.2 @@ -0,0 +1,22 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: '..' + +group :test do + gem "activerecord-jdbcsqlite3-adapter", platforms: [:jruby] + + platforms :ruby do + gem 'sqlite3', '~> 1.4' + end + + gem 'actionmailer', '~> 7.2.0' + gem 'activerecord', '~> 7.2.0' + gem 'capybara' + gem 'devise', '~> 4.8' + gem 'mocha' + gem 'mongoid' + gem 'nokogiri' + gem 'rspec-rails' + gem 'shoulda' +end diff --git a/gemfiles/Gemfile.rails-main b/gemfiles/Gemfile.rails-main index 8d9a0000..89f27340 100644 --- a/gemfiles/Gemfile.rails-main +++ b/gemfiles/Gemfile.rails-main @@ -9,7 +9,7 @@ group :test do end platforms :ruby do - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 2.1' end gem 'actionmailer', github: 'rails/rails'