From 8de7c1fac94fb534ab17eaaf4250086a2dc8c573 Mon Sep 17 00:00:00 2001 From: Vaishnavi Sirivolu Date: Fri, 1 Nov 2024 12:31:02 -0700 Subject: [PATCH 1/3] Added new workflow step to update dependencies --- .github/workflows/ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3252991..fcdba44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,4 +80,15 @@ jobs: toolchain: nightly - name: Remove lock run: rm Cargo.lock - - run: cargo build -Z minimal-versions \ No newline at end of file + - run: cargo build -Z minimal-versions + + dependency-updates: + name: dependency updates + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3.5.0 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: nightly + - name: Update packages + run: cargo update \ No newline at end of file From a41fa22a86c4ba871bac3182d5768d95b1dbaa9c Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sat, 2 Nov 2024 16:55:55 +0000 Subject: [PATCH 2/3] Run build/test with updated packages --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcdba44..bc32a2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,11 @@ jobs: - uses: actions/checkout@v3.5.0 - uses: dtolnay/rust-toolchain@stable with: - toolchain: nightly + toolchain: stable - name: Update packages - run: cargo update \ No newline at end of file + run: cargo update + - name: Build and test + run: cargo test --all-features -- --nocapture + env: + RUST_TEST_THREADS: 3 # So the parallel tests have enough threads + RUST_LOG: debug \ No newline at end of file From f6435ab8366d75ecf926bd263e34d02dca803286 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sat, 2 Nov 2024 17:11:20 +0000 Subject: [PATCH 3/3] Downgrade env_logger requirements (and up log, but it was implicit from the later env_logger) --- serial_test/Cargo.toml | 6 +++--- serial_test_derive/Cargo.toml | 2 +- serial_test_test/Cargo.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/serial_test/Cargo.toml b/serial_test/Cargo.toml index e28f2c0..f7c53ae 100644 --- a/serial_test/Cargo.toml +++ b/serial_test/Cargo.toml @@ -16,15 +16,15 @@ parking_lot = "^0.12" serial_test_derive = { version = "~3.1.1", path = "../serial_test_derive" } fslock = { version = "0.2", optional = true } document-features = { version = "0.2", optional = true } -log = { version = "0.4", optional = true } +log = { version = ">=0.4.4", optional = true } futures = { version = "^0.3", default_features = false, features = [ "executor", ], optional = true} scc = { version = "2"} -env_logger = {version="0.10", optional=true} +env_logger = {version=">=0.6.1", optional=true} [dev-dependencies] -itertools = "0.10" +itertools = ">=0.10" [features] default = ["logging", "async"] diff --git a/serial_test_derive/Cargo.toml b/serial_test_derive/Cargo.toml index cc3876f..f5c581a 100644 --- a/serial_test_derive/Cargo.toml +++ b/serial_test_derive/Cargo.toml @@ -18,7 +18,7 @@ syn = { version="2", features=["full"] } proc-macro2 = "1.0.60" # Because of https://github.com/dtolnay/proc-macro2/issues/356 [dev-dependencies] -env_logger = "0.10" +env_logger = ">=0.6.1" prettyplease = "0.2" [features] diff --git a/serial_test_test/Cargo.toml b/serial_test_test/Cargo.toml index a6b58ff..b41a21c 100644 --- a/serial_test_test/Cargo.toml +++ b/serial_test_test/Cargo.toml @@ -10,12 +10,12 @@ rust-version = "1.68.2" [dependencies] serial_test = { path="../serial_test", default_features = false } once_cell = "^1.19" -env_logger = "^0.10" +env_logger = ">=0.6.1" parking_lot = "^0.12" lock_api = "^0.4.7" wasm-bindgen-test = {version="0.3.20", optional=true} scoped-tls = {version="1", optional=true} -log = { version = "0.4" } +log = { version = ">=0.4.4" } [dev-dependencies] tokio = { version = "^1.27", features = ["macros", "rt"] }