Skip to content

Commit

Permalink
Update generated files and improve CI message (protocolbuffers#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmj authored May 15, 2022
1 parent 91aa844 commit 841bca4
Show file tree
Hide file tree
Showing 21 changed files with 599 additions and 602 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,12 @@ jobs:
run: |
rm -rf ./google_protobuf
if [[ -n "$(git status -uno --porcelain)" ]]; then
echo "Changes to the code seem to change the generated .pb.ex files."
echo "Make sure to run these tasks before merging:"
echo "CHANGES TO THE CODE SEEM TO CHANGE THE GENERATED .pb.ex FILES."
echo "MAKE SURE TO RUN THESE TASKS BEFORE MERGING:"
echo ""
echo " mix gen_bootstrap_protos"
echo " mix gen_test_protos"
echo " mix gen_bench_protos"
echo " mix do gen_bootstrap_protos, gen_test_protos, gen_bench_protos"
echo ""
echo "This is the git diff:"
git diff
echo "Run the above commands and `git diff` to verify the changes"
exit 1
else
echo "Generated .pb.ex are up to date"
Expand Down
2 changes: 1 addition & 1 deletion bench/lib/benchmarks.pb.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule Benchmarks.BenchmarkDataset do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto3
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto3

field :name, 1, type: :string
field :message_name, 2, type: :string, json_name: "messageName"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule Benchmarks.Proto2.GoogleMessage1 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field1, 1, required: true, type: :string
field :field9, 9, optional: true, type: :string
Expand Down Expand Up @@ -47,7 +47,7 @@ end

defmodule Benchmarks.Proto2.GoogleMessage1SubMessage do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field1, 1, optional: true, type: :int32, default: 0
field :field2, 2, optional: true, type: :int32, default: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule Benchmarks.Proto3.GoogleMessage1 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto3
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto3

field :field1, 1, type: :string
field :field9, 9, type: :string
Expand Down Expand Up @@ -47,7 +47,7 @@ end

defmodule Benchmarks.Proto3.GoogleMessage1SubMessage do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto3
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto3

field :field1, 1, type: :int32
field :field2, 2, type: :int32
Expand Down
6 changes: 3 additions & 3 deletions bench/lib/datasets/google_message2/benchmark_message2.pb.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule Benchmarks.Proto2.GoogleMessage2.Group1 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field11, 11, required: true, type: :float
field :field26, 26, optional: true, type: :float
Expand All @@ -22,7 +22,7 @@ end

defmodule Benchmarks.Proto2.GoogleMessage2 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field1, 1, optional: true, type: :string
field :field3, 3, optional: true, type: :int64
Expand Down Expand Up @@ -58,7 +58,7 @@ end

defmodule Benchmarks.Proto2.GoogleMessage2GroupedMessage do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field1, 1, optional: true, type: :float
field :field2, 2, optional: true, type: :float
Expand Down
68 changes: 34 additions & 34 deletions bench/lib/datasets/google_message3/benchmark_message3.pb.ex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defmodule Benchmarks.GoogleMessage3.GoogleMessage3 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field37519, 2, optional: true, type: Benchmarks.GoogleMessage3.Message37487
field :field37520, 3, optional: true, type: Benchmarks.GoogleMessage3.Message36876
Expand All @@ -21,7 +21,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message1327 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field1369, 1, repeated: true, type: Benchmarks.GoogleMessage3.UnusedEmptyMessage
field :field1370, 3, repeated: true, type: Benchmarks.GoogleMessage3.Message1328
Expand All @@ -31,23 +31,23 @@ end

defmodule Benchmarks.GoogleMessage3.Message3672.Message3673 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field3738, 4, required: true, type: Benchmarks.GoogleMessage3.Enum3476, enum: true
field :field3739, 5, required: true, type: :int32
end

defmodule Benchmarks.GoogleMessage3.Message3672.Message3674 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field3740, 7, required: true, type: Benchmarks.GoogleMessage3.Enum3476, enum: true
field :field3741, 8, required: true, type: :int32
end

defmodule Benchmarks.GoogleMessage3.Message3672 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field3727, 1, optional: true, type: Benchmarks.GoogleMessage3.Enum3476, enum: true
field :field3728, 11, optional: true, type: :int32
Expand All @@ -63,7 +63,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message3804 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field3818, 1, required: true, type: :int64
field :field3819, 2, required: true, type: :bool
Expand All @@ -76,28 +76,28 @@ end

defmodule Benchmarks.GoogleMessage3.Message6849 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field6910, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message6850
end

defmodule Benchmarks.GoogleMessage3.Message6866 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field6973, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message6863
end

defmodule Benchmarks.GoogleMessage3.Message6870 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field6991, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message6871
end

defmodule Benchmarks.GoogleMessage3.Message7651 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field7685, 1, optional: true, type: :string
field :field7686, 2, optional: true, type: :int64
Expand Down Expand Up @@ -148,7 +148,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message7864 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field7866, 1, optional: true, type: :string
field :field7867, 2, optional: true, type: :string
Expand All @@ -160,7 +160,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message7929 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field7942, 1, optional: true, type: :int64
field :field7943, 4, optional: true, type: :int64
Expand All @@ -186,7 +186,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message8508 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field8517, 8, repeated: true, type: Benchmarks.GoogleMessage3.Message8511
field :field8518, 9, repeated: true, type: Benchmarks.GoogleMessage3.Message8512
Expand All @@ -209,22 +209,22 @@ end

defmodule Benchmarks.GoogleMessage3.Message9122 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field9132, 1, optional: true, type: :float
field :field9133, 2, optional: true, type: :float
end

defmodule Benchmarks.GoogleMessage3.Message10177 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field10270, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message10155
end

defmodule Benchmarks.GoogleMessage3.Message10278 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field10286, 1, repeated: true, type: :int32, packed: true, deprecated: false
field :field10287, 2, repeated: true, type: :int32, packed: true, deprecated: false
Expand All @@ -233,29 +233,29 @@ end

defmodule Benchmarks.GoogleMessage3.Message10323 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field10360, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message10320
end

defmodule Benchmarks.GoogleMessage3.Message10324 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field10362, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message10322
field :field10363, 2, optional: true, type: Benchmarks.GoogleMessage3.Message10321
end

defmodule Benchmarks.GoogleMessage3.Message11990 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field12030, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message11988
end

defmodule Benchmarks.GoogleMessage3.Message12691 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field12713, 1, optional: true, type: :string
field :field12714, 2, optional: true, type: :int32
Expand All @@ -264,7 +264,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message12870 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field12879, 1, required: true, type: :int32
field :field12880, 7, optional: true, type: :int32
Expand All @@ -290,15 +290,15 @@ end

defmodule Benchmarks.GoogleMessage3.Message13154 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field13164, 1, required: true, type: :float
field :field13165, 2, required: true, type: :float
end

defmodule Benchmarks.GoogleMessage3.Message16507 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field16510, 3, optional: true, type: :bool
field :field16511, 4, optional: true, type: :bool
Expand Down Expand Up @@ -338,22 +338,22 @@ end

defmodule Benchmarks.GoogleMessage3.Message16564 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field16568, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message16552
end

defmodule Benchmarks.GoogleMessage3.Message16661 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field16671, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message16660
field :field16672, 2, repeated: true, type: :uint64
end

defmodule Benchmarks.GoogleMessage3.Message16746 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field16806, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message16727
field :field16807, 2, optional: true, type: :bool
Expand All @@ -363,7 +363,7 @@ end

defmodule Benchmarks.GoogleMessage3.Message17786.Message17787 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field18177, 2, required: true, type: :int32
field :field18178, 3, required: true, type: :int32
Expand Down Expand Up @@ -395,22 +395,22 @@ end

defmodule Benchmarks.GoogleMessage3.Message17786 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :message17787, 1, repeated: true, type: :group
field :field18175, 20, repeated: true, type: Benchmarks.GoogleMessage3.Message17782
end

defmodule Benchmarks.GoogleMessage3.Message22857 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field22874, 1, repeated: true, type: Benchmarks.GoogleMessage3.Message22853
end

defmodule Benchmarks.GoogleMessage3.Message24404.Message24405 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field24686, 2, required: true, type: :int32
field :field24687, 3, required: true, type: :int32
Expand Down Expand Up @@ -447,23 +447,23 @@ end

defmodule Benchmarks.GoogleMessage3.Message24404 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :message24405, 1, repeated: true, type: :group
field :field24684, 30, optional: true, type: Benchmarks.GoogleMessage3.Message24403
end

defmodule Benchmarks.GoogleMessage3.Message27300 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field27302, 1, repeated: true, type: Benchmarks.GoogleMessage3.UnusedEmptyMessage
field :field27303, 2, optional: true, type: :string
end

defmodule Benchmarks.GoogleMessage3.Message27453 do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

field :field27459, 15, optional: true, type: :string
field :field27460, 1, repeated: true, type: :string
Expand Down Expand Up @@ -492,7 +492,7 @@ end

defmodule Benchmarks.GoogleMessage3.PbExtension do
@moduledoc false
use Protobuf, protoc_gen_elixir_version: "0.9.0-dev", syntax: :proto2
use Protobuf, protoc_gen_elixir_version: "0.10.1-dev", syntax: :proto2

extend Benchmarks.GoogleMessage3.Message16945, :field17026, 472, optional: true, type: :string

Expand Down
Loading

0 comments on commit 841bca4

Please sign in to comment.