summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-01-19 20:30:02 -0800
committerTim Smith <tsmith@chef.io>2018-01-19 20:30:02 -0800
commitcec87a86852b425a9af4362c4115fa0772386743 (patch)
treeb9ba9b6edbe5e6d45ad556601d20cb2ce94a9be2 /Gemfile
parent9dd2aac3adefaf56bbd828b058b8baafbbcc9f3d (diff)
downloadchef-cec87a86852b425a9af4362c4115fa0772386743.tar.gz
Actually bump the version to 14 and dep on chef-config / ohai 14tm/branch_14
Without this the kitchen tests fail as there isn't a chef-config build at ~14.0. Ohai has been bumped to 14 and the chef-config dep updated to 14. For now we have to use builds from master since we don't have a gem. I left notes that we can remove those in the future. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 14b67daf94..7a5a26bbbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,8 @@ source "https://rubygems.org"
# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
gem "chef", path: "."
-gem "ohai", "~> 13"
+# @todo before shipping 14.0 we need to switch this over to a gem again
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "cheffish", "~> 13" # required for rspec tests