diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-05-30 08:40:36 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2016-05-30 08:40:36 +0200 |
| commit | dbec41f114ce5a6ccd55db28969c890f48a6ea44 (patch) | |
| tree | 02233d94ab04a78c7ccb3271f71ff67c6fb62f77 | |
| parent | cd3bffb1086420c02774ba905a403f8efe313f46 (diff) | |
| parent | de2e2acd91988e6b54f50f6c44ad85f28b68c615 (diff) | |
| download | coderay-dbec41f114ce5a6ccd55db28969c890f48a6ea44.tar.gz | |
Merged upstream
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 498158f..2c7b0f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,18 +13,18 @@ rvm: - jruby-head - jruby-18mode - jruby-19mode - - rbx-18mode - - rbx-19mode + - jruby-head + - rbx-2 +>>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615 branches: only: - master matrix: allow_failures: - rvm: ruby-head - - rvm: jruby-head - - rvm: rbx-18mode - - rvm: rbx-19mode - rvm: jruby-18mode - rvm: jruby-19mode + - rvm: jruby-head + - rvm: rbx-2 script: "rake test" # test:scanners" sudo: false |