diff options
| author | Tim Smith <tsmith@chef.io> | 2018-08-23 19:48:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 19:48:34 -0700 |
| commit | 68c738f1b3e4d90a8b2c09c0cc049ac0c23f2125 (patch) | |
| tree | 923d8d4c2baeec6e7606c31a9900e7816e23aa23 | |
| parent | e7d4d2c7cdb7512f669bf282492b41dc269f6c16 (diff) | |
| parent | 8fa32171addbaf2767ce3e93527b44df42b380fb (diff) | |
| download | chef-68c738f1b3e4d90a8b2c09c0cc049ac0c23f2125.tar.gz | |
Merge pull request #7579 from chef/more_build_simplification
Fix rake task to build the correct gemspec on Chef
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | chef-config/chef-config.gemspec | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -32,7 +32,9 @@ end task install: :super_install -Bundler::GemHelper.install_tasks name: "chef" +# make sure we build the correct gemspec on windows +gemspec = Gem.win_platform? ? "chef-universal-mingw32" : "chef" +Bundler::GemHelper.install_tasks name: gemspec task :pedant, :chef_zero_spec diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index a1afe21b18..547735bb55 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.add_dependency "addressable" spec.add_dependency "tomlrb", "~> 1.2" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "rake" %w{rspec-core rspec-expectations rspec-mocks}.each do |rspec| spec.add_development_dependency(rspec, "~> 3.2") |