diff options
author | Thom May <thom@may.lt> | 2017-10-24 10:39:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-24 10:39:42 +0100 |
commit | ac5c75f2a471e983cd48cc6861855c9c152d96b2 (patch) | |
tree | 855007fc10f5dca80f0276c96b8e0ea90bdee08f | |
parent | abb58900f7f719d7f4bf056cebc6400b622e8710 (diff) | |
parent | f56a59e0e3b94a7935844c248d674b65287cb8a6 (diff) | |
download | ohai-ac5c75f2a471e983cd48cc6861855c9c152d96b2.tar.gz |
Merge pull request #1077 from chef/fix_travis
Properly allow ruby-head to fail in Travis
-rw-r--r-- | .travis.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index c6a3bec7..dd49c7c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,17 +12,18 @@ branches: before_install: - gem update --system - gem --version - - rvm @global do gem uninstall bundler -a -x -I + - rvm @global do gem uninstall bundler -a -x -I || true - gem install bundler - bundle --version - rm -f .bundle/config rvm: - - 2.3.4 - - 2.4.1 + - 2.3.5 + - 2.4.2 - ruby-head -allow_failures: - - rvm: ruby-head +matrix: + allow_failures: + - rvm: ruby-head script: - bundle exec chefstyle |