Skip to content

Commit

Permalink
fix: bump prost-build to 0.10 to solve protobuf version incompatibility
Browse files Browse the repository at this point in the history
Should help solve the issue described in [1] by effectively upgrading
protoc from 3.15.8 to 3.19.4. However, from now on either protoc needs
to already be installed on the system to install, or prost-build needs
to have the tools available to build it from source (needs CMake an
C++ toolchain).

[1] protocolbuffers/protobuf#10051
  • Loading branch information
jvanstraten committed May 30, 2022
1 parent ac5051b commit f5e3223
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 18 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Install latest protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install sdist-only dependencies
if: ${{ matrix.type == 'sdist' }}
uses: actions-rs/toolchain@v1
Expand Down
90 changes: 77 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ substrait-validator = { path = "../rs", version = "0.0.1" }
pyo3 = { version = "0.15.1", features = ["extension-module"] }

[build-dependencies]
prost-build = "0.9"
prost-build = "0.10"
walkdir = "2"
dunce = "1"
6 changes: 3 additions & 3 deletions rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ include = ["src", "build.rs", "README.md"]
[dependencies]

# Prost is used to deal with protobuf serialization and deserialization.
prost = "0.9"
prost-types = "0.9"
prost = "0.10"
prost-types = "0.10"

# Prost doesn't generate any introspection stuff, so we hack that stuff in with
# our own procedural macros.
Expand Down Expand Up @@ -80,7 +80,7 @@ percent-encoding = "2.1"
[build-dependencies]

# Used for generating Rust structs from the protobuf definitions.
prost-build = "0.9"
prost-build = "0.10"

# Used to automatically find all protobuf files.
walkdir = "2"
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
walkdir = "2"
glob = "0.3"
prost-build = "0.9"
prost-build = "0.10"
rayon = "1.5"

0 comments on commit f5e3223

Please sign in to comment.