Merge pull request #422 from ruby-protobuf/gt/circle

Switch to circle-ci

Author: film42

.circleci/config.yml

@@ -0,0 +1,48 @@
+version: 2.1
+
+jobs:
+  # skipping build step because Gemfile.lock is not included in the source
+  # this makes the bundler caching step a noop
+  test:
+    parameters:
+      ruby-image:
+        type: string
+    docker:
+      - image: << parameters.ruby-image >>
+    steps:
+      - run:
+          name: Install protobuf compiler
+          command: |
+            archive=protoc-3.16.0-linux-x86_64
+            curl -O -L https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/$archive.zip
+            sudo unzip -d '/usr/local' $archive.zip 'bin/*' 'include/*'
+            sudo chown -R $(whoami) /usr/local/bin/protoc /usr/local/include/google
+            rm -rf $archive.zip
+      - run:
+          command: protoc --version
+      - run:
+          command: sudo apt-get update
+      - run:
+          message: Install ZeroMQ
+          command: sudo apt-get -y install libzmq3-dev
+      - checkout
+      - run:
+          command: gem install bundler
+      - run:
+          command: bundle install
+      - run:
+          command: bundle exec rake
+
+workflows:
+  build_and_test:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-image:
+                - circleci/jruby:9.2.6.0-jdk
+                - circleci/jruby:9.1.17.0-jdk
+                - circleci/jruby:9.2-jdk8
+                - circleci/ruby:2.4
+                - circleci/ruby:2.5
+                - circleci/ruby:2.7

.travis.yml

@@ -22,10 +22,12 @@ 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(' ')})
 
-    puts cmd
-    system(cmd)
+    proto_files.each do |proto_file|
+      cmd = %(protoc --plugin=protoc-gen-ruby-protobuf=./bin/protoc-gen-ruby --ruby-protobuf_out=#{proto_path} -I #{proto_path} #{proto_file})
+      puts cmd
+      system(cmd) || fail("Failed to compile spec proto: #{proto_file}")
+    end
   end
 
   desc 'Compile rpc protos in protos/ directory'
@@ -35,10 +37,10 @@ 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)
+    system(cmd) || fail("Failed to compile rpc protos!")
 
     files = {
       'tmp/rpc/dynamic_discovery.pb.rb'               => 'lib/protobuf/rpc',

Rakefile

@@ -22,6 +22,8 @@
 //
 // Protobufs needed for dynamic discovery zmq server and client.
 
+syntax = "proto2";
+
 package protobuf.rpc.dynamicDiscovery;
 
 enum BeaconType {

install-protobuf.sh

@@ -44,6 +44,8 @@
 // plugin should be named "protoc-gen-$NAME", and will then be used when the
 // flag "--${NAME}_out" is passed to protoc.
 
+syntax = "proto2";
+
 package google.protobuf.compiler;
 option java_package = "com.google.protobuf.compiler";
 option java_outer_classname = "PluginProtos";

proto/dynamic_discovery.proto

@@ -22,6 +22,8 @@
 //
 // Protobufs needed for socket rpcs.
 
+syntax = "proto2";
+
 package protobuf.socketrpc;
 
 message Request