Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into al/tokio-swarm-test
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	swarm-test/CHANGELOG.md
#	swarm-test/Cargo.toml
  • Loading branch information
ark0f committed Aug 21, 2024
2 parents 23a8d4a + 4dfc45b commit ae9d92e
Show file tree
Hide file tree
Showing 210 changed files with 5,854 additions and 1,680 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ jobs:
RUSTFLAGS: ''
steps:
- uses: actions/checkout@v4
- run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.31.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
- run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.33.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
shell: bash
- uses: obi1kenobi/cargo-semver-checks-action@c7306483f698c511eaf7416d1bf2e1958c90140f # v2
- uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6

rustfmt:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -398,6 +398,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check advisories bans licenses sources
1 change: 0 additions & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
run: cargo +nightly doc --no-deps --workspace -F full
env:
RUSTDOCFLAGS: "--cfg docsrs"
RUSTFLAGS: "--cfg docsrs"
- name: Add index file
run: |
mkdir host-docs
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
## Main APIs

- [`libp2p-core` CHANGELOG](core/CHANGELOG.md)
- [`libp2p-identity` CHANGELOG](identity/CHANGELOG.md)
- [`libp2p-swarm` CHANGELOG](swarm/CHANGELOG.md)
- [`libp2p-swarm-derive` CHANGELOG](swarm-derive/CHANGELOG.md)

Expand All @@ -13,7 +14,6 @@
- [`libp2p-floodsub` CHANGELOG](protocols/floodsub/CHANGELOG.md)
- [`libp2p-gossipsub` CHANGELOG](protocols/gossipsub/CHANGELOG.md)
- [`libp2p-identify` CHANGELOG](protocols/identify/CHANGELOG.md)
- [`libp2p-identity` CHANGELOG](protocols/identity/CHANGELOG.md)
- [`libp2p-kad` CHANGELOG](protocols/kad/CHANGELOG.md)
- [`libp2p-mdns` CHANGELOG](protocols/mdns/CHANGELOG.md)
- [`libp2p-ping` CHANGELOG](protocols/ping/CHANGELOG.md)
Expand Down
Loading

0 comments on commit ae9d92e

Please sign in to comment.