summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVikram Karve <vikram.karve@progress.com>2023-03-01 16:43:19 +0530
committerVikram Karve <vikram.karve@progress.com>2023-03-07 17:46:00 +0530
commit95b188a1bc84646568304d6f2456a0507fbe4b73 (patch)
treea21c733f596d524c22ab71179d3f7e095cb1e7f9
parentac725e62639844adc4e06d53a8f203fda17e6dc4 (diff)
downloadchef-95b188a1bc84646568304d6f2456a0507fbe4b73.tar.gz
cleanup need not depend on ruby, sync in line with main
Signed-off-by: Vikram Karve <vikram.karve@progress.com>
-rw-r--r--omnibus/config/software/chef-local-source.rb2
-rw-r--r--omnibus/config/software/more-ruby-cleanup.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/omnibus/config/software/chef-local-source.rb b/omnibus/config/software/chef-local-source.rb
index 49a2bfda59..833e81e131 100644
--- a/omnibus/config/software/chef-local-source.rb
+++ b/omnibus/config/software/chef-local-source.rb
@@ -46,7 +46,7 @@ end
# This is the behavior the transitive omnibus software deps such as chef-dk
# expect.
if version != "local_source"
- source git: "https://github.com/chef/chef.git"
+ source git: "https://github.com/chef/chef.git", branch: "chef-16"
end
# In order to pass notarization we need to sign any binaries and libraries included in the package.
diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb
index 39fb955486..a3de5f9e98 100644
--- a/omnibus/config/software/more-ruby-cleanup.rb
+++ b/omnibus/config/software/more-ruby-cleanup.rb
@@ -24,8 +24,6 @@ license :project_license
source path: "#{project.files_path}/#{name}"
-dependency "ruby"
-
build do
block "Removing console and setup binaries" do
Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*/bin/{console,setup}").each do |f|