Skip to content

Commit 3b29e47

Browse files
committed
update travis, rakefile, and protoc
- add ruby 2.6 to travis, remove EOL-ed rubies - the newer versions of protoc have a --ruby_out that takes precedence, alias the ruby plugin so it works with new versions of protoc - use binary protoc version 3.8.0
1 parent 30c8327 commit 3b29e47

File tree

3 files changed

+7
-45
lines changed

3 files changed

+7
-45
lines changed

.travis.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,20 @@ before_install:
77
- sudo make install
88
# Retrun to project directory
99
- cd ..
10-
- sudo -E ./install-protobuf.sh
10+
- curl -SsfL https://github.com/protocolbuffers/protobuf/releases/download/v3.8.0/protoc-3.8.0-linux-x86_64.zip
11+
- sudo -E unzip -d /usr protoc-3.8.0-linux-x86_64.zip
1112
- java -Xmx1g -version
1213
- javac -J-Xmx1g -version
1314
- export JRUBY_OPTS=-J-Xmx1g
1415
- gem update bundler
1516
language: ruby
1617
rvm:
17-
- 1.9.3
18-
- 2.0.0
19-
- 2.1
20-
- 2.2
2118
- 2.3
2219
- 2.4
2320
- 2.5
21+
- 2.6
2422
- jruby-9.1.17.0
25-
- jruby-9.2.5.0
26-
- rbx-2
27-
env:
28-
- PROTOBUF_VERSION=2.6.1
29-
- PROTOBUF_VERSION=3.0.0-alpha-2
30-
matrix:
31-
allow_failures:
32-
- rvm: rbx-2
33-
- env: PROTOBUF_VERSION=3.0.0-alpha-2
23+
- jruby-9.2.7.0
3424
notifications:
3525
webhooks:
3626
urls:

Rakefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ task :default => ['compile:spec', 'compile:rpc', :spec, :rubocop]
1818
desc 'Run specs'
1919
namespace :compile do
2020

21-
desc 'Compile spec protos in spec/supprt/ directory'
21+
desc 'Compile spec protos in spec/support/ directory'
2222
task :spec do
2323
proto_path = ::File.expand_path('../spec/support/', __FILE__)
2424
proto_files = Dir[File.join(proto_path, '**', '*.proto')]
25-
cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})
25+
cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})
2626

2727
puts cmd
2828
system(cmd)
@@ -35,7 +35,7 @@ namespace :compile do
3535
output_dir = ::File.expand_path('../tmp/rpc', __FILE__)
3636
::FileUtils.mkdir_p(output_dir)
3737

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

4040
puts cmd
4141
system(cmd)

install-protobuf.sh

-28
This file was deleted.

0 commit comments

Comments
 (0)