summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-03-19 13:10:29 +0000
committerThom May <thom@chef.io>2018-03-19 13:31:33 +0000
commitd6204e6009c138fa6028ce2fdba2a0feaa68336c (patch)
tree2b95fb98e81468f12ac69f5314323fcdab8f6b56
parent69c83a72aeb407695111353a6ca16b5c4a16d6aa (diff)
downloadchef-tm/13_lock_chef_zero.tar.gz
lock chef-13 to chef-zero 13tm/13_lock_chef_zero
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile.lock4
-rw-r--r--chef.gemspec2
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 4849604a80..969f35c8b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,7 +97,7 @@ matrix:
rvm: 2.4.3
- env:
TEST_GEM: chef/cheffish
- script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
+ script: bundle exec tasks/bin/run_external_test $TEST_GEM cheffish-13 rake spec
rvm: 2.4.3
- env:
TEST_GEM: chefspec/chefspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 5eb4b97592..9fd304103e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,7 +13,7 @@ PATH
addressable
bundler (>= 1.10)
chef-config (= 13.8.7)
- chef-zero (>= 13.0)
+ chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
@@ -43,7 +43,7 @@ PATH
addressable
bundler (>= 1.10)
chef-config (= 13.8.7)
- chef-zero (>= 13.0)
+ chef-zero (~> 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi (~> 1.9)
diff --git a/chef.gemspec b/chef.gemspec
index eb187df38f..a4c9244490 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.add_dependency "erubis", "~> 2.7"
s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
- s.add_dependency "chef-zero", ">= 13.0"
+ s.add_dependency "chef-zero", "~> 13.0"
s.add_dependency "plist", "~> 3.2"
s.add_dependency "iniparse", "~> 1.4"