Travis CI: Add Ruby 2.2

zuazo · Aug 30, 2015 · 2ffbc96 · 2ffbc96
1 parent eef11a4
commit 2ffbc96
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,25 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+- 1.9.3
+- 2.0.0
+- 2.1
+- 2.2
+
 sudo: false
+
 env:
   - CHEF_VERSION="~> 11.0"
   - CHEF_VERSION="~> 12.0"
+
 matrix:
   exclude:
-    - rvm: 1.9.3
-      env: CHEF_VERSION="~> 12.0"
+# Chef 12 requires Ruby 2:
+  - rvm: 1.9.3
+    env: CHEF_VERSION="~> 12.0"
+# Chef 11 cannot resolve dependencies in Ruby 2.2 (mixlib-shellout):
+  - rvm: 2.2
+    env: CHEF_VERSION="~> 11.0"
+
 bundler_args: --without doc integration integration_cloud guard
+
 script:
-  - bundle exec rake travis:ci
+- bundle exec rake travis:ci