Skip to content

Commit

Permalink
build(deps): update tokio-uring requirement from 0.4 to 0.5 (#568)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <[email protected]>
  • Loading branch information
dependabot[bot] and robjtede authored Jun 7, 2024
1 parent 451a44c commit a524f15
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:
read_msrv:
name: Read MSRV
uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@main
uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0

build_and_test:
needs:
Expand Down Expand Up @@ -109,8 +109,6 @@ jobs:
- name: tests
run: just test

# TODO: re-instate some io-uring tests for PRs

- name: CI cache clean
run: cargo-ci-cache-clean

Expand Down
2 changes: 1 addition & 1 deletion actix-rt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tokio = { version = "1.23.1", features = ["rt", "net", "parking_lot", "signal",

# runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies]
tokio-uring = { version = "0.4", optional = true }
tokio-uring = { version = "0.5", optional = true }

[dev-dependencies]
tokio = { version = "1.23.1", features = ["full"] }
2 changes: 1 addition & 1 deletion actix-rt/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ fn tokio_uring_arbiter() {
let f = tokio_uring::fs::File::create("test.txt").await.unwrap();
let buf = b"Hello World!";

let (res, _) = f.write_at(&buf[..], 0).await;
let (res, _) = f.write_all_at(&buf[..], 0).await;
assert!(res.is_ok());

f.sync_all().await.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion actix-server/Cargo.toml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }

# runtime for `io-uring` feature
[target.'cfg(target_os = "linux")'.dependencies]
tokio-uring = { version = "0.4", optional = true }
tokio-uring = { version = "0.5", optional = true }

[dev-dependencies]
actix-codec = "0.5"
Expand Down
9 changes: 9 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,20 @@ all_crate_features := if os() == "linux" {
}

# Test workspace code.
[macos, windows]
test toolchain="":
cargo {{ toolchain }} test --lib --tests --package=actix-macros
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ all_crate_features }}

# Test workspace code.
[linux]
test toolchain="":
cargo {{ toolchain }} test --lib --tests --package=actix-macros
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros --no-default-features
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ non_linux_all_features_list }}
cargo {{ toolchain }} nextest run --workspace --exclude=actix-macros {{ all_crate_features }}

# Test workspace using MSRV.
test-msrv: downgrade-for-msrv (test msrv_rustup)

Expand Down

0 comments on commit a524f15

Please sign in to comment.