Skip to content

Commit

Permalink
skip Rails 4 tests locally unless RAILS_4=true, let CI catch them for…
Browse files Browse the repository at this point in the history
… now
  • Loading branch information
justinfrench committed Mar 16, 2012
1 parent 4597800 commit 6d1a4a9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -11,6 +11,7 @@ gemfile:
- gemfiles/rails-4.gemfile
env:
- DEFER_GC=false
- RAILS_EDGE=true
script: "rake spec"
matrix:
exclude:
Expand Down
10 changes: 6 additions & 4 deletions Appraisals
Expand Up @@ -10,7 +10,9 @@ appraise 'rails-3.2' do
gem 'rails', '~> 3.2.0'
end

appraise 'rails-4' do
gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git'
end
if ENV["RAILS_EDGE"] == "true"
appraise 'rails-4' do
gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git'
end
end

0 comments on commit 6d1a4a9

Please sign in to comment.