Merge pull request #123 from chef/ci

Test ruby 2.1 instead of 1.9.3 and only launch one test group per travis/appveyor
inspec · Jul 5, 2016 · 086509a · 086509a
2 parents f64da2e + c871b7a
commit 086509a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,9 +14,13 @@ before_install:
   - gem install bundler
   - gem --version
 
+branches:
+  only:
+  - master
+
 matrix:
   include:
-  - rvm: 1.9.3
+  - rvm: 2.1
   - rvm: 2.0
   - rvm: 2.2
     script: bundle exec rake test test:docker config=test-travis-1.yaml

diff --git a/appveyor.yml b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
   bundler_url: https://rubygems.org/downloads/bundler-1.9.9.gem
 
   matrix:
-    - ruby_version: "193"
+    - ruby_version: "21"
       train_target: winrm://test_user@localhost:5985
 
     - ruby_version: "22"
@@ -23,6 +23,10 @@ environment:
 clone_folder: c:\projects\train
 clone_depth: 1
 
+branches:
+  only:
+    - master
+
 cache:
   - vendor/bundle -> appveyor.yml