summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-11-16 16:18:20 -0800
committerJohn Keiser <john@johnkeiser.com>2015-11-18 10:53:44 -0800
commitc82552be06e7305cae6bf7c00ff6759888df66b3 (patch)
treef0d2fd2f290dbb2f5638ed567786357e77b83fc4
parentcf9239f7a634473af2fce67bcead762407eea211 (diff)
downloadchef-c82552be06e7305cae6bf7c00ff6759888df66b3.tar.gz
Run latest chef-zero pedant
-rw-r--r--.travis.yml5
-rw-r--r--Gemfile2
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 421f3fd764..44317aaeff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,9 @@ matrix:
- rvm: 2.1
- rvm: 2.2
- rvm: 2.2
- gemfile: pedant.gemfile
- script: bundle exec rake pedant
+ cache:
+ env: "GEMFILE_MOD=\"gem 'chef-zero', github: 'chef/chef-zero'\""
+ script: bundle exec rake chef_zero_spec
- rvm: 2.2
cache:
env: "GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\""
diff --git a/Gemfile b/Gemfile
index 3441972f78..1bc5c79675 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ group(:development, :test) do
gem 'ruby-shadow', :platforms => :ruby unless RUBY_PLATFORM.downcase.match(/(aix|cygwin)/)
# For external tests
- gem 'chef-zero', github: 'chef/chef-zero', branch: 'cd/run-moar-pedant'
+# gem 'chef-zero', github: 'chef/chef-zero'
# gem 'cheffish', github: 'chef/cheffish'
# gem 'chef-provisioning'#, github: 'chef/chef-provisioning'
# gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'