Skip to content

Commit

Permalink
Revert "Manylinux2010-based Ruby images"
Browse files Browse the repository at this point in the history
This reverts commit bec51c0.
  • Loading branch information
apolcyn committed Dec 29, 2020
1 parent 8934661 commit 1c8e28d
Show file tree
Hide file tree
Showing 19 changed files with 11 additions and 871 deletions.
22 changes: 5 additions & 17 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ task 'gem:native' do
verbose = ENV['V'] || '0'

grpc_config = ENV['GRPC_CONFIG'] || 'opt'
ruby_cc_versions = '2.7.0:2.6.0:2.5.0:2.4.0:2.3.0'

if RUBY_PLATFORM =~ /darwin/
FileUtils.touch 'grpc_c.32.ruby'
Expand All @@ -131,28 +130,17 @@ task 'gem:native' do
"invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \
"build should be running on ruby 2.5."
end
system "rake cross native gem RUBY_CC_VERSION=#{ruby_cc_versions} V=#{verbose} GRPC_CONFIG=#{grpc_config}"
system "rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}"
else
Rake::Task['dlls'].execute
['x86-mingw32', 'x64-mingw32'].each do |plat|
['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat|
run_rake_compiler plat, <<-EOT
gem update --system --no-document && \
bundle && \
rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem pkg/#{spec.full_name}.gem \
RUBY_CC_VERSION=#{ruby_cc_versions} V=#{verbose} GRPC_CONFIG=#{grpc_config}
EOT
end
# Truncate grpc_c.*.ruby files because they're for Windows only.
File.truncate('grpc_c.32.ruby', 0)
File.truncate('grpc_c.64.ruby', 0)
['x86_64-linux', 'x86-linux'].each do |plat|
run_rake_compiler plat, <<-EOT
gem update --system --no-document && \
bundle && \
rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem pkg/#{spec.full_name}.gem \
RUBY_CC_VERSION=#{ruby_cc_versions} V=#{verbose} GRPC_CONFIG=#{grpc_config} &&
sudo chmod -R a+rw pkg &&
patchelf_gem.sh pkg/#{spec.full_name}-#{plat}.gem
RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0:2.3.0 \
V=#{verbose} \
GRPC_CONFIG=#{grpc_config}
EOT
end
end
Expand Down
46 changes: 0 additions & 46 deletions third_party/rake-compiler-dock/README.md

This file was deleted.

30 changes: 0 additions & 30 deletions third_party/rake-compiler-dock/build/patchelf_gem.sh

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1c8e28d

Please sign in to comment.