summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-05-05 19:35:15 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-05-05 19:35:15 -0700
commitfac767656ed35a2ea615c350ff5cb591b729570a (patch)
tree41641fb18dca8e0206a8c4c97154dd6ca85522fb
parent7d4c769e0196e8167662beabc67dbbc02d42a437 (diff)
parent1fc84d53df245ea5e983aaa8bacab7a39fd9b043 (diff)
downloadchef-fac767656ed35a2ea615c350ff5cb591b729570a.tar.gz
Merge pull request #3335 from chef/lcg/tweak-travis
let the ruby patchlevels float
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 699d8237ad..5f00e90645 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,14 @@ env:
matrix:
include:
- - rvm: 2.0.0
- - rvm: 2.1.5
- - rvm: 2.2.0
- - rvm: 2.1.5
+ - rvm: 2.0
+ - rvm: 2.1
+ - rvm: 2.2
+ - rvm: 2.1
gemfile: pedant.gemfile
script: bundle exec rake pedant
### START TEST KITCHEN ONLY ###
- - rvm: 2.1.5
+ - rvm: 2.1
gemfile: kitchen-tests/Gemfile
before_install:
- echo -n $DO_KEY_CHUNK_{0..30} >> ~/.ssh/id_aws.base64