summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index f701ef4..a0c6cb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,9 @@ branches:
sudo: false
-script: bundle exec rake pedant
+script:
+ - bundle update
+ - bundle exec rake pedant
matrix:
include:
@@ -21,6 +23,10 @@ matrix:
- 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
@@ -29,11 +35,11 @@ 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
+# 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