summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-04-19 16:04:46 -0700
committerGitHub <noreply@github.com>2018-04-19 16:04:46 -0700
commitde94ca867631e096ecadd811df9e52c8aa26e17d (patch)
tree1e99c91924f11f94a91ae9f6c40706933faea077
parent5c0ce1a422a8f4cd078059a7c8c4d5d0c6017a31 (diff)
parentc6239a0a1ca6ad2e2fd07c47a7c639ccf56527e9 (diff)
downloadchef-zero-de94ca867631e096ecadd811df9e52c8aa26e17d.tar.gz
Merge pull request #279 from chef/lcg/remove-explicit-chef-gem
remove the explicit chef gem
-rw-r--r--.travis.yml4
-rw-r--r--Gemfile6
2 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 23da645..ed06caf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,10 @@ script:
- bundle update
- bundle exec rake pedant
+env:
+ global:
+ - "GEMFILE_MOD=\"gem 'chef', '~> 13.0'\""
+
matrix:
include:
- rvm: 2.5.0
diff --git a/Gemfile b/Gemfile
index 0a11dea..1253282 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,9 +11,11 @@ group :development, :test do
gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
end
-gem "chef", "~> 13"
-
if ENV["GEMFILE_MOD"]
puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
instance_eval(ENV["GEMFILE_MOD"])
end
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")