Merge pull request #16 from hoppergee/maintain

Maintain

Author: hoppergee

.github/workflows/main.yaml

@@ -30,14 +30,15 @@ jobs:
     name: ruby-${{ matrix.ruby }} ${{ matrix.rails }}
     strategy:
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
-        rails: ['6.0', '6.1', 'master']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
+        rails: ['6.1', '7.0']
         exclude: 
           - ruby: '2.6'
-            rails: 'master'
+            rails: '7.0'
 
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/github-action/rails-${{ matrix.rails }}-Gemfile
+      MIGRATION_VESRION: ${{ matrix.rails }}
+      RAILS_VERSION: ~> ${{ matrix.rails }}.0
       BUNDLE_PATH_RELATIVE_TO_CWD: true
       DATABASE_USERNAME: postgres
       REDIS_HOST: '0.0.0.0'

.gitignore

@@ -5,11 +5,14 @@
 /tmp/
 /test/dummy/db/*.sqlite3
 /test/dummy/db/*.sqlite3-*
+/test/dummy/db/schema.rb
 /test/dummy/log/*.log
 /test/dummy/storage/
 /test/dummy/tmp/
 .byebug_history
 Gemfile.lock
 /test/generators/tmp/
-/gemfiles/**/*Gemfile.lock
-.DS_Store
+.DS_Store
+.matrixeval/docker-compose
+.matrixeval/gemfile_locks
+.matrixeval/schema

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [1.5.0] - 2022-02-21
+
+- Support Rails >= 6.1 only
+- Test with [matrixeval-ruby](https://github.com/MatrixEval/matrixeval-ruby)
+
 ## [1.4.0] - 2021-10-13
 
 #### Add

Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
+if rails_version = ENV['RAILS_VERSION']
+  gem 'rails', rails_version
+end
+
 # Specify your gem's dependencies in multi_tenant_support.gemspec.
 gemspec
 
@@ -11,11 +15,19 @@ end
 
 # To use a debugger
 group :development, :test do
+  gem 'matrixeval-ruby'
   gem 'byebug'
   gem 'rspec'
   gem 'rspec-rails'
   gem 'capybara'
   gem 'sidekiq'
+
+  # Ruby 3.1 split out the net-smtp gem
+  # Necessary until https://github.com/mikel/mail/pull/1439
+  # got merged and released.
+  if Gem.ruby_version >= Gem::Version.new("3.1.0")
+    gem "net-smtp", "~> 0.3.0", require: false
+  end
 end
 
 group :test do