Merge pull request #978 from projectblacklight/travis-build

Simplify travis builds

Author: jcoyne

.travis.yml

@@ -2,32 +2,34 @@ notifications:
   email: false
 
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.1.2
 
 matrix:
   include:
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails4.gemfile
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=4.0.9"
+    - rvm: 2.0.0
+      env: "RAILS_VERSION=4.1.5"
     - rvm: 1.9.3
-      gemfile: gemfiles/rails4.gemfile
+      env: "RAILS_VERSION=4.1.5"
     - rvm: jruby
-      gemfile: gemfiles/rails4.gemfile
-      
+      env: "RAILS_VERSION=4.1.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=4.2.0.beta1"
+  allow_failures:
+    - env: "RAILS_VERSION=4.2.0.beta1"
+
 before_install:
-  - gem install bundler 
+  - gem install bundler
 
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
-  - gemfiles/rails4.1.gemfile
+env:
+ - "RAILS_VERSION=3.2.19"
+ - "RAILS_VERSION=4.1.5"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - [email protected]
 
-env:
-  global:
-    - JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+global_env:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Please see blacklight.gemspec for dependency information.
 gemspec path: File.expand_path('..', __FILE__)
 
-
 # Peg simplecov to < 0.8 until this is resolved:
 # https://github.com/colszowka/simplecov/issues/281
 gem 'simplecov', '~> 0.7.1', require: false
@@ -20,4 +19,9 @@ file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_
 if File.exists?(file)
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(file)
+else
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
+  # explicitly include sass-rails to get compatible sprocket dependencies
+  gem 'sass-rails'
 end