Skip to content

Commit

Permalink
Merge pull request #143 from chef/jk/ruby23
Browse files Browse the repository at this point in the history
Enable Ruby 2.3 in Travis, make it default suite
  • Loading branch information
chris-rock authored Aug 26, 2016
2 parents 2eff9fb + 4e919a5 commit 6831c6c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,25 @@ branches:

matrix:
include:
- rvm: 2.1
- rvm: 2.0
- rvm: 2.2
- rvm: 2.2.5
- rvm: 2.1.9
- rvm: 2.0.0-p648
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test"
- rvm: 2.2
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-debian.yml"
- rvm: 2.2
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-centos.yml"
- rvm: 2.2
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-oel.yml"
- rvm: 2.2
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-fedora.yml"
- rvm: 2.2
- rvm: 2.3.1
script: bundle exec rake $SUITE
env: SUITE="test:docker config=test-travis-ubuntu.yml"

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ environment:
- ruby_version: "21"
train_target: winrm://test_user@localhost:5985

- ruby_version: "22"
- ruby_version: "23"
train_target: winrm://test_user@localhost:5985

- ruby_version: "22"
- ruby_version: "23"
train_ssl: true
train_target: winrm://test_user@localhost:5986

Expand Down

0 comments on commit 6831c6c

Please sign in to comment.