Merge pull request #442 from jaredbeck/test_rails_6.0.0

Test rails 6.0.0
rails · Oct 9, 2019 · 7ab889c · 7ab889c
2 parents 137a3ba + 04aea0c
commit 7ab889c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,8 @@ gemfile:
   - gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
   - gemfiles/Gemfile.rails-5.2.x
   - gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
+  - gemfiles/Gemfile.rails-6.0.x
+  - gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
 
 matrix:
   exclude:
@@ -86,7 +88,7 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
-      rvm: 2.4.5      
+      rvm: 2.4.5
     - gemfile: gemfiles/Gemfile.rails-5.2.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-5.2.x
@@ -104,7 +106,31 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
-      rvm: 2.4.5      
+      rvm: 2.4.5
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 2.1.10
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 2.2.10
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 2.3.8
+    - gemfile: gemfiles/Gemfile.rails-6.0.x
+      rvm: 2.4.5
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 2.1.10
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 2.2.10
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 2.3.8
+    - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
+      rvm: 2.4.5
 
 notifications:
   email: false

diff --git a/gemfiles/Gemfile.rails-6.0.x b/gemfiles/Gemfile.rails-6.0.x
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+gemspec path: '..'
+
+gem 'actionpack', '~> 6.0.0'
+gem 'railties', '~> 6.0.0'
+gem 'sprockets', github: 'rails/sprockets', branch: '3.x'
diff --git a/gemfiles/Gemfile.rails-6.0.x.sprockets-4.x b/gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+gemspec path: '..'
+
+gem 'actionpack', '~> 6.0.0'
+gem 'railties', '~> 6.0.0'
+gem 'sprockets', github: 'rails/sprockets', branch: 'master'