summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-01-28 16:10:42 -0800
committerJohn Keiser <john@johnkeiser.com>2016-01-28 16:25:35 -0800
commit1b4bae95b0230a2105253aeacff2e701a9f11f08 (patch)
treea2c516f9ad55a4a59c65310a01fd875a91b9eaf3 /Gemfile
parent934ffef0432b0245691b08487a7a5f094c90dc6f (diff)
downloadchef-zero-1b4bae95b0230a2105253aeacff2e701a9f11f08.tar.gz
Run chef-zero against master chef on travis
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 900c416..abf7169 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,16 @@
source 'https://rubygems.org'
gemspec
-gem 'rest-client', :github => 'chef/rest-client'
+# gem 'rest-client', :github => 'chef/rest-client'
gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => "jk/authorization-tags"
# bundler resolve failure on "rspec_junit_formatter"
# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
-gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
+# gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
+
+if ENV['GEMFILE_MOD']
+ puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
+ instance_eval(ENV['GEMFILE_MOD'])
+end