Skip to content

Commit

Permalink
Merge branch 'master' into feat-kad-count
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire authored Nov 22, 2022
2 parents 055636e + 9b18277 commit d5cb7e9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Check public API for semver violations
if: steps.check-released.outputs.code == 200 # Workaround until https://github.com/obi1kenobi/cargo-semver-check/issues/146 is shipped.
run: |
cargo install cargo-semver-checks
cargo install cargo-semver-checks --locked
cargo semver-checks check-release -p ${{ matrix.crate }}
cross:
Expand Down Expand Up @@ -231,12 +231,12 @@ jobs:
run: |
ALL_FEATURES=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "libp2p") | .features | keys | map(select(. != "full")) | sort | join(" ")')
FULL_FEATURE=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "libp2p") | .features["full"] | sort | join(" ")')
test "$ALL_FEATURES = $FULL_FEATURE"
echo "$ALL_FEATURES";
echo "$FULL_FEATURE";
test "$ALL_FEATURES" = "$FULL_FEATURE"
gather_published_crates:
Expand Down
6 changes: 2 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,8 @@ pub use libp2p_plaintext as plaintext;
pub use libp2p_pnet as pnet;
#[cfg(feature = "quic")]
#[cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))]
pub mod quic {
#[doc(inline)]
pub use libp2p_quic::*;
}
#[doc(inline)]
pub use libp2p_quic as quic;
#[cfg(feature = "relay")]
#[doc(inline)]
pub use libp2p_relay as relay;
Expand Down

0 comments on commit d5cb7e9

Please sign in to comment.