Skip to content

Commit

Permalink
Merge pull request jasmine#233 from joshk/patch-1
Browse files Browse the repository at this point in the history
Use the new build env on Travis.

When a co-founder of Travis changes your `travis.yaml` you say YES.
  • Loading branch information
infews committed Nov 21, 2014
2 parents 005174b + 14a545b commit 69433fa
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --trace; else bundle exec rake --trace; fi"

install:
- bundle install --retry=3
language: ruby

rvm:
- "1.9.3"
Expand All @@ -15,6 +12,13 @@ env:
- "RAILS_VERSION=rails4"
- "RAILS_VERSION=pojs"

sudo: false

script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --trace; else bundle exec rake --trace; fi"

install:
- bundle install --retry=3

matrix:
include:
- rvm: "2.0.0"
Expand Down

0 comments on commit 69433fa

Please sign in to comment.