Merge pull request sass#130 from javierjulio/update-ci-gemfiles

Update Travis with Rails 6 and to use all current minor releases
code-dot-org · Dec 2, 2019 · 8d0462d · 8d0462d
2 parents 59ad121 + 38cc821
commit 8d0462d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ gemfile:
   - gemfiles/sprockets_4_0.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 
 rvm:
   - 2.4.6
@@ -26,6 +27,11 @@ matrix:
   allow_failures:
     - gemfile: gemfiles/rails_4_2.gemfile
       rvm: jruby
+    - gemfile: gemfiles/rails_6_0.gemfile
+      rvm: jruby
+  exclude:
+    - gemfile: gemfiles/rails_6_0.gemfile
+      rvm: 2.4.6
 
 notifications:
   email: false
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.0.a"
+
+# Specify your gem's dependencies in sassc-rails.gemspec
+gemspec path: "../"
diff --git a/gemfiles/sprockets-rails_3_0.gemfile b/gemfiles/sprockets-rails_3_0.gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "sprockets-rails", "~> 3.0.0"
+gem "sprockets-rails", "~> 3.2"
 
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec path: "../"
diff --git a/gemfiles/sprockets_3_0.gemfile b/gemfiles/sprockets_3_0.gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "sprockets", "~> 3.0.3"
+gem "sprockets", "~> 3.7"
 
 # Specify your gem's dependencies in sassc-rails.gemspec
 gemspec path: "../"