diff options
author | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
---|---|---|
committer | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
commit | 3ddffabc91bee3ba136a9367f24083b6bf9fd7ef (patch) | |
tree | e73ce4213df554530b1088bc9d082b62f46f2862 /.travis.yml | |
parent | ea50d0179c51d271c9fead299e9bf6dd06fe9689 (diff) | |
parent | 24055a152492123b7516e9b4e54af5710ffed247 (diff) | |
download | psych-3ddffabc91bee3ba136a9367f24083b6bf9fd7ef.tar.gz |
Merge remote-tracking branch 'origin/master' into jruby
Conflicts:
.gitignore
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9dc61c1..2c45195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ rvm: - 1.9.2 - 1.9.3 + - 2.0.0 + - 2.1.0 - ruby-head before_script: - - gem install isolate - gem install hoe - gem install rake-compiler -script: rake isolate test + - gem install minitest -v '~> 4.0' +script: rake test |