Merge pull request #15 from ifad/chore/test-am-61-ruby-3

Test against ActiveModel 6.1 and Ruby 3
ifad · Dec 30, 2020 · 3c36ad4 · 3c36ad4
2 parents b9ffd81 + a05bba5
commit 3c36ad4
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,8 @@ rvm:
  - 2.4.10
  - 2.5.8
  - 2.6.6
- - 2.7.1
+ - 2.7.2
+ - 3.0.0
  - ruby-head
 
 gemfile:
@@ -23,6 +24,7 @@ gemfile:
  - gemfiles/am_5.1.gemfile
  - gemfiles/am_5.2.gemfile
  - gemfiles/am_6.0.gemfile
+ - gemfiles/am_6.1.gemfile
  - gemfiles/am_edge.gemfile
 
 jobs:
@@ -38,11 +40,15 @@ jobs:
  gemfile: gemfiles/am_5.2.gemfile
  - rvm: 2.1.10
  gemfile: gemfiles/am_6.0.gemfile
+ - rvm: 2.1.10
+ gemfile: gemfiles/am_6.1.gemfile
  - rvm: 2.1.10
  gemfile: gemfiles/am_edge.gemfile
 
  - rvm: 2.2.10
  gemfile: gemfiles/am_6.0.gemfile
+ - rvm: 2.2.10
+ gemfile: gemfiles/am_6.1.gemfile
  - rvm: 2.2.10
  gemfile: gemfiles/am_edge.gemfile
 
@@ -52,6 +58,8 @@ jobs:
  gemfile: gemfiles/am_4.1.gemfile
  - rvm: 2.3.8
  gemfile: gemfiles/am_6.0.gemfile
+ - rvm: 2.3.8
+ gemfile: gemfiles/am_6.1.gemfile
  - rvm: 2.3.8
  gemfile: gemfiles/am_edge.gemfile
 
@@ -63,6 +71,8 @@ jobs:
  gemfile: gemfiles/am_4.1.gemfile
  - rvm: 2.4.10
  gemfile: gemfiles/am_6.0.gemfile
+ - rvm: 2.4.10
+ gemfile: gemfiles/am_6.1.gemfile
  - rvm: 2.4.10
  gemfile: gemfiles/am_edge.gemfile
 
@@ -84,19 +94,34 @@ jobs:
  - rvm: 2.6.6
  gemfile: gemfiles/am_4.2.gemfile
 
- - rvm: 2.7.1
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_3.2.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_4.0.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_4.1.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_4.2.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_5.0.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_5.1.gemfile
+ - rvm: 2.7.2
+ gemfile: gemfiles/am_5.2.gemfile
+
+ - rvm: 3.0.0
  gemfile: gemfiles/am_3.2.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_4.0.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_4.1.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_4.2.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_5.0.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_5.1.gemfile
- - rvm: 2.7.1
+ - rvm: 3.0.0
  gemfile: gemfiles/am_5.2.gemfile
 
  - rvm: ruby-head

diff --git a/Appraisals b/Appraisals
@@ -40,6 +40,11 @@ appraise 'am-6.0' do
  gem 'activesupport', "~> 6.0.0"
 end
 
+appraise 'am-6.1' do
+ gem 'activemodel', "~> 6.1.0"
+ gem 'activesupport', "~> 6.1.0"
+end
+
 appraise 'am-edge' do
  gem 'activemodel', git: "https://github.com/rails/rails.git"
  gem 'activesupport', git: "https://github.com/rails/rails.git"

diff --git a/gemfiles/am_6.1.gemfile b/gemfiles/am_6.1.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 6.1.0"
+gem "activesupport", "~> 6.1.0"
+
+gemspec path: "../"