diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5782e7..90bec94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,15 +24,40 @@ jobs: fail-fast: false matrix: ruby: + - '3.4' + - '3.3' + - '3.2' - '3.1' - '3.0' - '2.7' rails: + - "8.1.0" + - "8.0.0" + - "7.2.0" + - "7.1.0" - "7.0.0" - "6.1.0" - "6.0.0" + exclude: + - rails: "8.1.0" + ruby: "3.1" + - rails: "8.1.0" + ruby: "3.0" + - rails: "8.1.0" + ruby: "2.7" + - rails: "8.0.0" + ruby: "3.1" + - rails: "8.0.0" + ruby: "3.0" + - rails: "8.0.0" + ruby: "2.7" + - rails: "7.2.0" + ruby: "3.0" + - rails: "7.2.0" + ruby: "2.7" env: APT_DEPS: libsqlite3-dev + BUNDLE_WITHOUT: tools benchmarks docs RAILS_VERSION: "${{matrix.rails}}" RAILS_ENV: test @@ -45,11 +70,6 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: "${{matrix.ruby}}" - - name: Install latest bundler - run: | - gem install bundler --no-document - bundle config set without 'tools benchmarks docs' - - name: Bundle install - run: bundle install --jobs 4 --retry 3 + bundler-cache: true - name: Run all tests run: bundle exec rake app:db:reset app:spec diff --git a/Gemfile b/Gemfile index 68879f1..6f0cb44 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -RAILS_VERSION = ENV.fetch("RAILS_VERSION", '7.0.4').freeze +RAILS_VERSION = ENV.fetch("RAILS_VERSION", '8.1.0').freeze %w(railties actionview actionpack activerecord).each do |name| gem name, "~> #{RAILS_VERSION}" @@ -38,4 +38,7 @@ group :test do gem 'generator_spec' gem 'rack-test' gem 'rspec-rails', '~> 3.1' + gem 'mutex_m' + gem 'base64' + gem 'drb' end diff --git a/rom-rails.gemspec b/rom-rails.gemspec index 726158b..61ed058 100644 --- a/rom-rails.gemspec +++ b/rom-rails.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'addressable', '~> 2.3' spec.add_runtime_dependency 'dry-core', '~> 1.0' - spec.add_runtime_dependency 'railties', '>= 6.0', '< 8.0.0' + spec.add_runtime_dependency 'railties', '>= 6.0', '< 8.2.0' spec.add_runtime_dependency 'rom', '~> 5.3' spec.add_development_dependency "bundler" diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index e482e32..2bab005 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -1,5 +1,6 @@ require File.expand_path('../boot', __FILE__) +require 'logger' require 'action_controller/railtie' Bundler.setup(:default, Rails.env)