summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-06-29 07:18:28 -0700
committerThomas Powell <powell@progress.com>2022-08-23 11:08:51 -0400
commit2f5dbd1ee69c970fc06870477dbbca6c5c3555c4 (patch)
treede0dcdb7b443306b000d71f70d54bb08ff2d2e6f /Rakefile
parent964236952f9fad2398a6a3a2501774e430b17b6d (diff)
downloadchef-2f5dbd1ee69c970fc06870477dbbca6c5c3555c4.tar.gz
Integrate ruby 3.1 into builds
This is a combination of 64 commits, the originals were mostly repeating one-line messages so that history has not been kept here. Signed-off-by: Thomas Powell <thomas.powell@progress.com> Signed-off-by: Marc Paradise <marc@chef.io> Signed-off-by: John McCrae <john.mccrae@progress.com>
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Rakefile b/Rakefile
index 17c6a62ca8..62c2df2455 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,7 +40,7 @@ namespace :pre_install do
%w{chef-utils chef-config}.each do |gem|
path = ::File.join(::File.dirname(__FILE__), gem)
Dir.chdir(path) do
- sh("rake install")
+ system "rake install"
end
end
end
@@ -61,16 +61,16 @@ end
# hack in all the preinstall tasks to occur before the traditional install task
task install: "pre_install:all"
-
# make sure we build the correct gemspec on windows
-gemspec = Gem.win_platform? ? "chef-universal-mingw32" : "chef"
+gemspec = Gem.win_platform? ? "chef-universal-mingw-ucrt" : "chef"
+
Bundler::GemHelper.install_tasks name: gemspec
# this gets appended to the normal bundler install helper
task :install do
chef_bin_path = ::File.join(::File.dirname(__FILE__), "chef-bin")
Dir.chdir(chef_bin_path) do
- sh("rake install:force")
+ system "rake install:force"
end
end
@@ -80,7 +80,7 @@ namespace :install do
task :local do
chef_bin_path = ::File.join(::File.dirname(__FILE__), "chef-bin")
Dir.chdir(chef_bin_path) do
- sh("rake install:local")
+ system "rake install:local"
end
end
end