Merge pull request #194 from chef/lcg/chef-17

Uncomment GEMFILE_MOD
chef · Apr 22, 2021 · d759ead · d759ead
2 parents 5dc3c41 + 37f5ff0
commit d759ead
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,20 +8,20 @@ group :development do
   gem "rspec", "~> 3.0"
 end
 
-# temporarily we only support building against master
-gem "chef", github: "chef/chef", branch: "master"
-gem "ohai", github: "chef/ohai", branch: "master"
 
 # Allow Travis to run tests with different dependency versions
-# if ENV["GEMFILE_MOD"]
-#   puts ENV["GEMFILE_MOD"]
-#   instance_eval(ENV["GEMFILE_MOD"])
-# else
-#   group :development do
-#     gem "chef", "~> 16"
-#     gem "ohai", "~> 16"
-#   end
-# end
+if ENV["GEMFILE_MOD"]
+  puts ENV["GEMFILE_MOD"]
+  instance_eval(ENV["GEMFILE_MOD"])
+else
+  group :development do
+    # temporarily we only support building against master
+    gem "chef", github: "chef/chef", branch: "master"
+    gem "ohai", github: "chef/ohai", branch: "master"
+    # gem "chef", "~> 16"
+    # gem "ohai", "~> 16"
+  end
+end
 
 group :docs do
   gem "yard"