Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,12 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2

- run: cargo install --version 0.10.0 pb-rs --locked
- uses: dtolnay/rust-toolchain@stable

- name: Glob match
uses: tj-actions/glob@v22
id: glob
with:
files: |
**/generated/*.proto
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2

- name: Generate proto files
run: pb-rs --dont_use_cow ${{ steps.glob.outputs.paths }}
run: cd misc/gen-proto && cargo run

- name: Ensure generated files are unmodified # https://stackoverflow.com/a/5737794
run: |
Expand Down
107 changes: 60 additions & 47 deletions Cargo.lock

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

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ members = [
"misc/metrics",
"misc/multistream-select",
"misc/peer-store",
"misc/quick-protobuf-codec",
"misc/prost-codec",
"misc/quickcheck-ext",
"misc/rw-stream-sink",
"misc/server",
Expand Down Expand Up @@ -84,7 +84,7 @@ libp2p-dns = { version = "0.45.0", path = "transports/dns" }
libp2p-floodsub = { version = "0.48.0", path = "protocols/floodsub" }
libp2p-gossipsub = { version = "0.50.0", path = "protocols/gossipsub" }
libp2p-identify = { version = "0.48.0", path = "protocols/identify" }
libp2p-identity = { version = "0.2.13" }
libp2p-identity = { version = "0.2.14" }
libp2p-kad = { version = "0.49.0", path = "protocols/kad" }
libp2p-mdns = { version = "0.49.0", path = "protocols/mdns" }
libp2p-memory-connection-limits = { version = "0.6.0", path = "misc/memory-connection-limits" }
Expand All @@ -110,7 +110,7 @@ libp2p-tls = { version = "0.7.0", path = "transports/tls" }
libp2p-uds = { version = "0.44.0", path = "transports/uds" }
libp2p-upnp = { version = "0.7.0", path = "protocols/upnp" }
libp2p-webrtc = { version = "0.10.0-alpha", path = "transports/webrtc" }
libp2p-webrtc-utils = { version = "0.5.0", path = "misc/webrtc-utils" }
libp2p-webrtc-utils = { version = "0.6.0", path = "misc/webrtc-utils" }
libp2p-webrtc-websys = { version = "0.5.0", path = "transports/webrtc-websys" }
libp2p-websocket = { version = "0.46.0", path = "transports/websocket" }
libp2p-websocket-websys = { version = "0.6.0", path = "transports/websocket-websys" }
Expand All @@ -134,7 +134,8 @@ multiaddr = "0.18.1"
multihash = "0.19.5"
multistream-select = { version = "0.14.0", path = "misc/multistream-select" }
prometheus-client = "0.24"
quick-protobuf-codec = { version = "0.4.0", path = "misc/quick-protobuf-codec" }
prost-codec = { version = "0.4.0", path = "misc/prost-codec" }
prost = "0.14"
quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
rcgen = "0.13"
ring = "0.17.12"
Expand Down
2 changes: 2 additions & 0 deletions core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

- Raise MSRV to 1.88.0.
See [PR 6273](https://github.com/libp2p/rust-libp2p/pull/6273).
- Revert migration from `prost` to `quick-protobuf`; this reintroduces the `protoc` build-time dependency (revert of [PR 3312]).
See [PR 6363](https://github.com/libp2p/rust-libp2p/pull/6363).

## 0.43.2

Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ multihash = { workspace = true }
multistream-select = { workspace = true }
parking_lot = "0.12.5"
pin-project = "1.1.11"
quick-protobuf = "0.8"
prost = { workspace = true }
rand = "0.8"
rw-stream-sink = { workspace = true }
thiserror = { workspace = true }
Expand Down
Loading
Loading