summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVikram Karve <vikram.karve@progress.com>2022-09-02 16:14:04 +0530
committerVikram Karve <vikram.karve@progress.com>2022-09-02 16:14:04 +0530
commit2fb12d99560932897553c3a4750a98b0023c8e80 (patch)
tree36e80abb2432026cac37e419387ce482091abe61
parentaf2813a5fe1ce014967ad7833075ac5bf831b8d4 (diff)
downloadchef-vkarve/fix-notarize-v2.tar.gz
Reintroduce omnibus ruby-cleanup, ruby-shadow gem dep & keep bundler version in sync with Ruby 3.1 defaultvkarve/fix-notarize-v2
Signed-off-by: Vikram Karve <vikram.karve@progress.com>
-rw-r--r--Gemfile.lock10
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus/config/projects/chef.rb4
3 files changed, 12 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 67344cca33..69d9b66898 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,6 +29,13 @@ GIT
netrc (~> 0.8)
GIT
+ remote: https://github.com/chef/ruby-shadow
+ revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c
+ branch: lcg/ruby-3.0
+ specs:
+ ruby-shadow (2.5.0)
+
+GIT
remote: https://github.com/chef/ruby-proxifier
revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
branch: lcg/ruby-3
@@ -499,7 +506,8 @@ DEPENDENCIES
rb-readline
rest-client!
rspec
+ ruby-shadow!
webmock
BUNDLED WITH
- 2.3.18
+ 2.3.7
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index fd8cff7059..0edc35475a 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -479,4 +479,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 2.3.18
+ 2.3.7
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 3de79303e8..217170ffef 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"]