Skip to content

Commit

Permalink
Merge pull request #528 from arthurnn/travis_one_file
Browse files Browse the repository at this point in the history
Few Travis configs
  • Loading branch information
arthurnn committed Mar 11, 2014
2 parents 8ca4d4f + c8d0a54 commit 289dfac
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 45 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 0 additions & 20 deletions Gemfile.edge

This file was deleted.

19 changes: 0 additions & 19 deletions Gemfile.rails3

This file was deleted.

0 comments on commit 289dfac

Please sign in to comment.