Permalink
Browse files

Merge pull request #528 from arthurnn/travis_one_file

Few Travis configs
  • Loading branch information...
2 parents 8ca4d4f + c8d0a54 commit 289dfac7438abf26cdb9129ccdfd1510efddcd6a @arthurnn arthurnn committed Mar 11, 2014
Showing with 18 additions and 45 deletions.
  1. +6 −5 .travis.yml
  2. +12 −1 Gemfile
  3. +0 −20 Gemfile.edge
  4. +0 −19 Gemfile.rails3
View
@@ -2,14 +2,15 @@ language: ruby
rvm:
- 1.9.3
- 2.0.0
- - 2.1.0
+ - 2.1.1
- ruby-head
- jruby
- rbx-2
-gemfile:
- - Gemfile
- - Gemfile.rails3
- - Gemfile.edge
+env:
+ - "RAILS_VERSION=3.2.17"
+ - "RAILS_VERSION=4.0.3"
+ - "RAILS_VERSION=4.1.0.rc1"
+ - "RAILS_VERSION=master"
matrix:
allow_failures:
- rvm: ruby-head
View
13 Gemfile
@@ -17,4 +17,15 @@ platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end
-gem 'rails', '~> 4.0.0'
+version = ENV["RAILS_VERSION"] || "4.0.2"
+rails = case version
+ when "master"
+ {:github => "rails/rails"}
+ else
+ "~> #{version}"
+ end
+gem "rails", rails
+
+if version < "4"
+ gem "minitest", "~> 4.7.5"
+end
View
@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
- gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
- gem 'coveralls', require: false
- gem 'simplecov', require: false
-end
-
-platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-# Use Rails master + current dependencies
-gem 'rails', github: 'rails/rails'
-gem 'arel', github: 'rails/arel'
View
@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
- gem 'sqlite3', '1.3.8'
-end
-
-platforms :mri do
- gem 'coveralls', require: false
- gem 'simplecov', require: false
-end
-
-platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-gem 'minitest', '~> 4.0'
-gem 'rails', '~> 3.2'

0 comments on commit 289dfac

Please sign in to comment.