Skip to content

Commit

Permalink
protobuf: bump to 3.28.0, disable upb.
Browse files Browse the repository at this point in the history
I don't know why automation didn't handle this, but bumps protobuf to
latest released version.

Also removes upb which is causing issues with downstream dependencies
(otel-nginx).
  • Loading branch information
wlynch committed Oct 8, 2024
1 parent 20ca9a0 commit 6e35ae8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 22 deletions.
6 changes: 3 additions & 3 deletions grpc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: grpc
version: 1.65.5
epoch: 1
version: 1.67.0
epoch: 0
description: The C based gRPC
copyright:
- license: Apache-2.0 AND BSD-3-Clause AND MIT
Expand Down Expand Up @@ -48,7 +48,7 @@ pipeline:
with:
repository: https://github.com/grpc/grpc
tag: v${{package.version}}
expected-commit: c93b7788310705514a84d0f6f8921b9aef87f5d9
expected-commit: 74f245857247b4b3e28a753d85d06ae2d5a55434

- runs: |
cd third_party
Expand Down
2 changes: 1 addition & 1 deletion protobuf-c.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: protobuf-c
version: 1.5.0
epoch: 9
epoch: 10
description: Protocol Buffers implementation in C
copyright:
- license: BSD-2-Clause
Expand Down
25 changes: 7 additions & 18 deletions protobuf.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: protobuf
version: 3.27.4
epoch: 0
version: 3.28.2
epoch: 1
description: Library for extensible, efficient structure packing
copyright:
- license: BSD-3-Clause
Expand Down Expand Up @@ -34,7 +34,7 @@ pipeline:
with:
repository: https://github.com/protocolbuffers/protobuf
tag: v${{package.version}}
expected-commit: 80d48ae92d3007caac5eab0a8f8ee4e57f3a921e
expected-commit: 9fff46d7327c699ef970769d5c9fd0e44df08fc7

- runs: |
cd third_party
Expand All @@ -47,7 +47,8 @@ pipeline:
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=Release \
-Dprotobuf_ABSL_PROVIDER=package \
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_BUILD_TESTS=OFF \
-Dprotobuf_BUILD_LIBUPB=OFF
ninja -C build
DESTDIR=${{targets.destdir}} ninja -C build install
Expand Down Expand Up @@ -79,8 +80,8 @@ subpackages:
- name: Verify protoc installation
runs: |
protoc --version || exit 1
protoc-27.4.0 --version
protoc-27.4.0 --help
protoc-28.2.0 --version
protoc-28.2.0 --help
- name: Compile sample proto file
runs: |
echo 'syntax = "proto3"; message Test { string name = 1; }' > test.proto
Expand Down Expand Up @@ -127,15 +128,3 @@ test:
pipeline:
- runs: |
protoc --help
protoc-gen-upb --version
protoc-gen-upb --help
protoc-gen-upb-27.4.0 --version
protoc-gen-upb-27.4.0 --help
protoc-gen-upb_minitable --version
protoc-gen-upb_minitable --help
protoc-gen-upb_minitable-27.4.0 --version
protoc-gen-upb_minitable-27.4.0 --help
protoc-gen-upbdefs --version
protoc-gen-upbdefs --help
protoc-gen-upbdefs-27.4.0 --version
protoc-gen-upbdefs-27.4.0 --help

0 comments on commit 6e35ae8

Please sign in to comment.