From 278101951d5c19d6d8966c8c3ae5602940852f9b Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 12 Mar 2020 20:14:42 -0700 Subject: Remove some of the ruby cleanup to fix builds Let's see if this gets the tests passing again. Signed-off-by: Tim Smith --- omnibus/config/software/more-ruby-cleanup.rb | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb index 6cfb526def..ac2dc5d7d1 100644 --- a/omnibus/config/software/more-ruby-cleanup.rb +++ b/omnibus/config/software/more-ruby-cleanup.rb @@ -24,9 +24,6 @@ license :project_license source path: "#{project.files_path}/#{name}" -dependency "ruby" -dependency "rubygems" - build do block "Removing additional non-code files from installed gems" do # find the embedded ruby gems dir and clean it up for globbing @@ -76,23 +73,4 @@ build do FileUtils.rm_rf(f) end end - - block "Removing Gemspec / Rakefile / Gemfile unless there's a bin dir" do - # find the embedded ruby gems dir and clean it up for globbing - target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/") - files = %w{ - *.gemspec - Gemfile - Rakefile - tasks/*.rake - } - - Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f| - # don't delete these files if there's a bin dir in the same dir - unless Dir.exist?(File.join(File.dirname(f), "bin")) - puts "Deleting #{f}" - File.delete(f) - end - end - end end \ No newline at end of file -- cgit v1.2.1