Skip to content

Commit 086509a

Browse files
authored
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
2 parents f64da2e + c871b7a commit 086509a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ before_install:
1414
- gem install bundler
1515
- gem --version
1616

17+
branches:
18+
only:
19+
- master
20+
1721
matrix:
1822
include:
19-
- rvm: 1.9.3
23+
- rvm: 2.1
2024
- rvm: 2.0
2125
- rvm: 2.2
2226
script: bundle exec rake test test:docker config=test-travis-1.yaml

appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
bundler_url: https://rubygems.org/downloads/bundler-1.9.9.gem
1111

1212
matrix:
13-
- ruby_version: "193"
13+
- ruby_version: "21"
1414
train_target: winrm://test_user@localhost:5985
1515

1616
- ruby_version: "22"
@@ -23,6 +23,10 @@ environment:
2323
clone_folder: c:\projects\train
2424
clone_depth: 1
2525

26+
branches:
27+
only:
28+
- master
29+
2630
cache:
2731
- vendor/bundle -> appveyor.yml
2832

0 commit comments

Comments
 (0)