diff --git a/.gitignore b/.gitignore index 96bad3a..4e680d6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ coverage tmp bin .rubocop-https* +gemfiles/master.gemfile.lock diff --git a/.travis.yml b/.travis.yml index db5e1c1..d5dca69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ gemfile: - gemfiles/5.1.gemfile - gemfiles/5.2.gemfile - gemfiles/6.0.gemfile + - gemfiles/master.gemfile matrix: exclude: - rvm: 2.3 @@ -29,6 +30,7 @@ matrix: fast_finish: true allow_failures: - rvm: ruby-head + - gemfile: gemfiles/master.gemfile branches: only: - master diff --git a/Appraisals b/Appraisals index effaf28..c4dff5b 100644 --- a/Appraisals +++ b/Appraisals @@ -27,3 +27,9 @@ appraise "6.0" do gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby] gem "sqlite3", platforms: [:ruby] end + +appraise "master" do + gem "activerecord", github: "rails/rails" + gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby] + gem "sqlite3", platforms: [:ruby] +end diff --git a/gemfiles/master.gemfile b/gemfiles/master.gemfile new file mode 100644 index 0000000..88459fd --- /dev/null +++ b/gemfiles/master.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby] +gem "sqlite3", platforms: [:ruby] +gem "activerecord", github: "rails/rails" + +gemspec name: "factory_bot", path: "../"