diff options
author | Lamont Granquist <lamont@getchef.com> | 2019-04-30 13:01:28 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 13:01:28 -0700 |
commit | a1abccf64a373f3cff965863fa119f809093e863 (patch) | |
tree | 95396835512c385f5eca41c72d68173ffbf3dc74 /Gemfile | |
parent | 23dddb873c10c96fc733e15dd31c1775dafe86da (diff) | |
parent | 2ea62e01d77630f5d17935ef7551d21e95aae0d0 (diff) | |
download | chef-a1abccf64a373f3cff965863fa119f809093e863.tar.gz |
Merge pull request #8439 from chef/lcg/fix-bundling-in-omnibus
fix chef-bin bundling in omnibus
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -11,7 +11,15 @@ gem "chef", path: "." 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 "chef-bin", path: File.expand_path("../chef-bin", __FILE__) if File.exist?(File.expand_path("../chef-bin", __FILE__)) + +if File.exist?(File.expand_path("../chef-bin", __FILE__)) + # bundling in a git checkout + gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__) +else + # bundling in omnibus + gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem +end + gem "cheffish", "~> 14" group(:omnibus_package) do |