Skip to content
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

Upgraded protobuf to support cross crate imports. #24

Merged
merged 44 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
25ab1b0
snapshot
pompon0 Oct 30, 2023
1a9752c
extracted protobuf utils
pompon0 Oct 30, 2023
e349058
snapshot
pompon0 Oct 30, 2023
9260b2d
reflection is broken
pompon0 Oct 30, 2023
ce390b2
works
pompon0 Oct 30, 2023
af960b8
reorganized crates
pompon0 Oct 30, 2023
679a1d5
added missing files
pompon0 Oct 31, 2023
bea6f03
doesn't really work
pompon0 Nov 1, 2023
61c9c16
works
pompon0 Nov 1, 2023
a71030f
introduced config
pompon0 Nov 1, 2023
6f906e6
before moving protos to deeper packages
pompon0 Nov 1, 2023
f95b5ee
snapshot
pompon0 Nov 1, 2023
4747c15
protox
pompon0 Nov 1, 2023
05fa17a
Merge remote-tracking branch 'origin/main' into gprusak-split-schema
pompon0 Nov 1, 2023
70b23d7
fixed reflect
pompon0 Nov 1, 2023
6a9ce92
distributed the proto files
pompon0 Nov 2, 2023
e077532
reduced config
pompon0 Nov 2, 2023
d81b815
documentation WIP
pompon0 Nov 3, 2023
87bae08
snapshot
pompon0 Nov 3, 2023
b0a22ab
snapshot
pompon0 Nov 3, 2023
d3debe3
snapshot
pompon0 Nov 3, 2023
b195065
error messages are sufficient now
pompon0 Nov 3, 2023
3808c28
fixed rerun, protobuf -> zksync_protobuf
pompon0 Nov 3, 2023
b9c88ba
cargo_fmt
pompon0 Nov 3, 2023
1948af4
presubmit
pompon0 Nov 3, 2023
a5493e5
conformance
pompon0 Nov 3, 2023
068a522
Merge remote-tracking branch 'origin/main' into gprusak-split-schema
pompon0 Nov 3, 2023
e96d0be
compatibility
pompon0 Nov 3, 2023
d2fc4dd
compatibility
pompon0 Nov 3, 2023
e37f4f4
compatibility
pompon0 Nov 3, 2023
64e21c8
fix for the conformance test
pompon0 Nov 3, 2023
7d5a640
file rename
pompon0 Nov 3, 2023
b854854
compatibility
pompon0 Nov 3, 2023
f01b63c
code attribution
pompon0 Nov 3, 2023
608ed40
Update node/libs/protobuf/src/bin/conformance_test/main.rs
pompon0 Nov 7, 2023
66f6dc7
applied comments
pompon0 Nov 7, 2023
112f4d1
removed proto_root
pompon0 Nov 7, 2023
1bc66d6
Merge remote-tracking branch 'origin/gprusak-split-schema' into gprus…
pompon0 Nov 7, 2023
a447ba1
reverted
pompon0 Nov 7, 2023
0e6f3d7
declare_descriptor macro
pompon0 Nov 7, 2023
197947d
Merge remote-tracking branch 'origin/main' into gprusak-split-schema
pompon0 Nov 7, 2023
5cb5e41
cargo fmt
pompon0 Nov 7, 2023
3598b33
applied comments
pompon0 Nov 7, 2023
2c9fb49
use quote to generate code
pompon0 Nov 8, 2023
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
28 changes: 25 additions & 3 deletions .github/workflows/protobuf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,46 @@ on:
branches: ["main"]

env:
PROTOS_DIR: "node/libs/schema/proto"
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: "0"
RUSTFLAGS: "-Dwarnings -C linker=clang -C link-arg=-fuse-ld=lld -C link-arg=-Wl,-z,nostart-stop-gc"
RUSTC_WRAPPER: "sccache"
SCCACHE_GHA_ENABLED: "true"
RUST_BACKTRACE: "1"

jobs:
compatibility:
runs-on: ubuntu-latest
steps:
# github.base_ref -> github.head_ref for pull_request
# github.event.before -> github.event.after for push
- uses: mozilla-actions/[email protected]
- uses: actions/checkout@v3
with:
ref: ${{ github.base_ref || github.event.before }}
path: before
- name: compile before
run: cargo build --all-targets
working-directory: ./before/node
- name: build before.binpb
run: >
perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
`find ./before/node/target/debug/build/*/output`
| xargs cat > ./before.binpb
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref || github.event.after }}
path: after
- name: compile after
run: cargo build --all-targets
working-directory: ./after/node
- name: build after.binpb
run: >
perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
`find ./after/node/target/debug/build/*/output`
| xargs cat > ./after.binpb
- uses: bufbuild/buf-setup-action@v1
- uses: bufbuild/buf-breaking-action@v1
with:
input: "after/$PROTOS_DIR"
against: "before/$PROTOS_DIR"
input: "./after.binpb"
against: "./before.binpb"
4 changes: 2 additions & 2 deletions .github/workflows/protobuf_conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
path: "protobuf"
- uses: mozilla-actions/[email protected]
- name: build test
run: cargo build -p schema --bin conformance_test
run: cargo build -p zksync_protobuf --bin conformance_test
working-directory: "this/node"
- name: Cache Bazel
uses: actions/cache@v3
Expand All @@ -41,6 +41,6 @@ jobs:
- name: run test
run: >
bazel run //conformance:conformance_test_runner --
--failure_list "${{ github.workspace }}/this/node/libs/schema/src/bin/conformance_test_failure_list.txt"
--failure_list "${{ github.workspace }}/this/node/libs/protobuf/src/bin/conformance_test/failure_list.txt"
"${{ github.workspace }}/this/node/target/debug/conformance_test"
working-directory: "protobuf"
Loading