diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-06-29 07:18:28 -0700 |
|---|---|---|
| committer | Thomas Powell <powell@progress.com> | 2022-08-23 11:08:51 -0400 |
| commit | 2f5dbd1ee69c970fc06870477dbbca6c5c3555c4 (patch) | |
| tree | de0dcdb7b443306b000d71f70d54bb08ff2d2e6f /omnibus/config/projects | |
| parent | 964236952f9fad2398a6a3a2501774e430b17b6d (diff) | |
| download | chef-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 'omnibus/config/projects')
| -rw-r--r-- | omnibus/config/projects/chef.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 94c0236841..3a9f2dc891 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -64,10 +64,10 @@ dependency "openssl-customization" # devkit needs to come dead last these days so we do not use it to compile any gems dependency "ruby-msys2-devkit" if windows? -dependency "ruby-cleanup" +# dependency "ruby-cleanup" # further gem cleanup other projects might not yet want to use -dependency "more-ruby-cleanup" +# dependency "more-ruby-cleanup" package :rpm do signing_passphrase ENV["OMNIBUS_RPM_SIGNING_PASSPHRASE"] @@ -95,7 +95,7 @@ package :msi do wix_candle_extension "WixUtilExtension" wix_light_extension "WixUtilExtension" signing_identity "AF21BA8C9E50AE20DA9907B6E2D4B0CC3306CA03", machine_store: true - parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-mingw32/ext/win32-eventlog/chef-log.dll")), + parameters ChefLogDllPath: windows_safe_path(gem_path("chef-[0-9]*-x64-mingw-ucrt/ext/win32-eventlog/chef-log.dll")), ProjectLocationDir: project_location_dir end |