aboutsummaryrefslogtreecommitdiffstats
path: root/main/protobuf/trim-rakefile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/protobuf/trim-rakefile.patch')
-rw-r--r--main/protobuf/trim-rakefile.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/main/protobuf/trim-rakefile.patch b/main/protobuf/trim-rakefile.patch
index f03bf92684..3c15e0020b 100644
--- a/main/protobuf/trim-rakefile.patch
+++ b/main/protobuf/trim-rakefile.patch
@@ -37,13 +37,13 @@ Remove code that we don't use to avoid installing additional dependencies.
-
- task 'gem:windows' do
- require 'rake_compiler_dock'
-- RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.5:2.0.0"
+- RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
- end
-
- if RUBY_PLATFORM =~ /darwin/
- task 'gem:native' do
- system "rake genproto"
-- system "rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.5:2.0.0"
+- system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
- end
- else
- task 'gem:native' => [:genproto, 'gem:windows']
@@ -54,13 +54,13 @@ Remove code that we don't use to avoid installing additional dependencies.
# Proto for tests.
genproto_output << "tests/generated_code.rb"
genproto_output << "tests/test_import.rb"
-@@ -93,9 +52,6 @@
-
- task :clean do
+@@ -95,9 +54,6 @@
sh "rm -f #{genproto_output.join(' ')}"
--end
--
--Gem::PackageTask.new(spec) do |pkg|
end
+-Gem::PackageTask.new(spec) do |pkg|
+-end
+-
Rake::TestTask.new(:test => :build) do |t|
+ t.test_files = FileList["tests/*.rb"].exclude("tests/gc_test.rb")
+ end