Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/rust-embed-8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaseizinger authored Sep 4, 2023
2 parents 91944f5 + 66cdcc6 commit 5f63394
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 77 deletions.
36 changes: 0 additions & 36 deletions .github/actions/cargo-semver-checks/action.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ updates:
commit-message:
prefix: "deps"
rebase-strategy: "disabled"
groups:
trust-dns:
patterns:
- "trust-dns-*"
- "async-std-resolver"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
22 changes: 8 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,6 @@ jobs:
- name: Check if we compile without any features activated
run: cargo build --package "$CRATE" --no-default-features

- run: cargo clean

- name: Check if crate has been released
id: check-released
run: |
RESPONSE_CODE=$(curl https://crates.io/api/v1/crates/"$CRATE" --silent --write-out "%{http_code}" --output /dev/null)
echo "code=${RESPONSE_CODE}"
echo "code=${RESPONSE_CODE}" >> $GITHUB_OUTPUT
- uses: ./.github/actions/cargo-semver-checks
if: steps.check-released.outputs.code == 200 && !contains(fromJSON('["libp2p-swarm-derive", "libp2p-server"]'), env.CRATE) # Workaround until https://github.com/obi1kenobi/cargo-semver-check/issues/146 is shipped.
with:
crate: ${{ env.CRATE }}

- name: Enforce no dependency on meta crate
if: env.CRATE != 'libp2p-server'
run: |
Expand Down Expand Up @@ -273,6 +259,14 @@ jobs:
cargo check --manifest-path "$toml";
done
semver:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.22.1/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
shell: bash
- uses: obi1kenobi/cargo-semver-checks-action@v2

rustfmt:
runs-on: ubuntu-latest
steps:
Expand Down
39 changes: 15 additions & 24 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 transports/quic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ log = "0.4"
parking_lot = "0.12.0"
quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
rand = "0.8.5"
rustls = { version = "0.21.6", default-features = false }
rustls = { version = "0.21.7", default-features = false }
thiserror = "1.0.44"
tokio = { version = "1.32.0", default-features = false, features = ["net", "rt", "time"], optional = true }
socket2 = "0.5.3"
Expand Down
2 changes: 1 addition & 1 deletion transports/tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ yasna = "0.5.2"

# Exposed dependencies. Breaking changes to these are breaking changes to us.
[dependencies.rustls]
version = "0.21.6"
version = "0.21.7"
default-features = false
features = ["dangerous_configuration"] # Must enable this to allow for custom verification code.

Expand Down
2 changes: 1 addition & 1 deletion transports/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ parking_lot = "0.12.0"
quicksink = "0.1"
rw-stream-sink = { workspace = true }
soketto = "0.7.0"
url = "2.1"
url = "2.4"
webpki-roots = "0.25"

[dev-dependencies]
Expand Down

0 comments on commit 5f63394

Please sign in to comment.