diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index c0b640e..4994db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,34 @@ -rvm: 2.0 +rvm: 2.1 gemfile: Gemfile +# This prevents testing branches that are created just for PRs +branches: + only: + - master + +# Early warning system to catch if Rubygems breaks something +before_install: + - gem update --system + - gem install bundler + sudo: false -script: bundle exec rake pedant +script: + - bundle update + - bundle exec rake pedant matrix: include: - - rvm: 2.0 - rvm: 2.1 + env: PEDANT_KNIFE_TESTS=true PEDANT_ALLOW_RVM=1 - rvm: 2.1 env: SINGLE_ORG=true - rvm: 2.1 env: CHEF_FS=true - rvm: 2.1 + env: + - CHEF_FS=true + - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" + - rvm: 2.1 env: FILE_STORE=true - rvm: 2.1 script: bundle exec rake chef_spec @@ -21,11 +37,3 @@ matrix: script: bundle exec rake spec env: TEST=rake_spec - allow_failures: - - rvm: 2.1 - gemfile: gemfiles/latest-chef.gemfile - script: bundle exec rake chef_spec - enc: TEST=chef_spec_latest -# - rvm: 2.1.1 -# gemfile: gemfiles/berkshelf.gemfile -# script: bundle exec rake berkshelf_spec |