summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-08-22 17:25:06 -0700
committerTim Smith <tsmith@chef.io>2018-08-22 17:25:06 -0700
commitfa4852e03c3596ff24eeb8fec1148716d04d246a (patch)
tree66a11c78f83750a1c574d09343536b3899e3f06a
parent4ff11119636f3c68b3da28e93ea61262d12e9aa1 (diff)
downloadchef-fa4852e03c3596ff24eeb8fec1148716d04d246a.tar.gz
Make rake install install both chef and chef-config
A simple way to make it reach back to call rake install on chef-config first. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Rakefile11
-rw-r--r--chef-config/Rakefile2
2 files changed, 12 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 982af3f11c..32a688ef7f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,16 @@ require_relative "tasks/cbgb"
require_relative "tasks/dependencies"
require_relative "tasks/announce"
-Bundler::GemHelper.install_tasks name: 'chef'
+# hack the chef-config install to runon before the traditional install task
+task :super_install do
+ chef_config_path = ::File.join(::File.dirname(__FILE__), "chef-config")
+ Dir.chdir(chef_config_path)
+ sh("rake install")
+end
+
+task :install => :super_install
+
+Bundler::GemHelper.install_tasks name: "chef"
task :pedant, :chef_zero_spec
diff --git a/chef-config/Rakefile b/chef-config/Rakefile
index 3ef4ac2a0c..df2f59e298 100644
--- a/chef-config/Rakefile
+++ b/chef-config/Rakefile
@@ -1,3 +1,5 @@
+require "bundler/gem_tasks"
+
task default: :spec
begin