Skip to content

Update TravisCI build #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ AllCops:
Exclude:
- 'spec/support/protos/*.pb.rb'
- 'varint_prof.rb'
- 'protobuf-*/**/*.rb'

Lint/EndAlignment:
AlignWith: keyword
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ rvm:
- rbx-2
env:
- PROTOBUF_VERSION=2.6.1
- PROTOBUF_VERSION=3.0.0-alpha-2
- PROTOBUF_VERSION=3.0.0
- PROTOBUF_VERSION=3.6.0
- PROTOBUF_VERSION=3.11.0
matrix:
allow_failures:
- rvm: rbx-2
- env: PROTOBUF_VERSION=3.0.0-alpha-2
notifications:
webhooks:
urls:
Expand Down
23 changes: 23 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
source 'https://rubygems.org'

gemspec

group :development do
# debuggers only work in MRI
if RUBY_ENGINE.to_sym == :ruby
if RUBY_VERSION < '2.0.0'
gem 'pry-debugger'
elsif RUBY_VERSION < '2.4.0'
gem 'pry-byebug'
gem 'pry', '~> 0.12.0'
else
gem 'pry-byebug', '~> 3.9.0'
gem 'pry', '~> 0.13.0'
end

gem 'pry-stack_explorer'

gem 'varint'
gem 'ruby-prof'
elsif RUBY_PLATFORM =~ /java/i
gem 'fast_blank_java'
gem 'pry'
end
end
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace :compile do
task :spec do
proto_path = ::File.expand_path('../spec/support/', __FILE__)
proto_files = Dir[File.join(proto_path, '**', '*.proto')]
cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})
cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})

puts cmd
system(cmd)
Expand All @@ -35,7 +35,7 @@ namespace :compile do
output_dir = ::File.expand_path('../tmp/rpc', __FILE__)
::FileUtils.mkdir_p(output_dir)

cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{output_dir} -I #{proto_path} #{proto_files.join(' ')})
cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{output_dir} -I #{proto_path} #{proto_files.join(' ')})

puts cmd
system(cmd)
Expand Down
19 changes: 0 additions & 19 deletions protobuf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,4 @@ require "protobuf/version"
s.add_development_dependency 'simplecov'
s.add_development_dependency 'timecop'
s.add_development_dependency 'yard'

# debuggers only work in MRI
if RUBY_ENGINE.to_sym == :ruby
# we don't support MRI < 1.9.3
pry_debugger = if RUBY_VERSION < '2.0.0'
'pry-debugger'
else
'pry-byebug'
end

s.add_development_dependency pry_debugger
s.add_development_dependency 'pry-stack_explorer'

s.add_development_dependency 'varint'
s.add_development_dependency 'ruby-prof'
elsif RUBY_PLATFORM =~ /java/i
s.add_development_dependency 'fast_blank_java'
s.add_development_dependency 'pry'
end
end