diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 082a586..0998c39 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -39,7 +39,7 @@ jobs: with: toolchain: stable components: clippy, rustfmt - - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: node-version: "20" cache: npm diff --git a/.github/workflows/vscode-extension.yml b/.github/workflows/vscode-extension.yml index 665a33d..36fe0e3 100644 --- a/.github/workflows/vscode-extension.yml +++ b/.github/workflows/vscode-extension.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - - uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6 + - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 with: node-version: "20" cache: npm diff --git a/crates/cargo-ferry/src/deployment/logs.rs b/crates/cargo-ferry/src/deployment/logs.rs index 39a38c9..c282c6b 100644 --- a/crates/cargo-ferry/src/deployment/logs.rs +++ b/crates/cargo-ferry/src/deployment/logs.rs @@ -896,8 +896,8 @@ mod tests { #[test] fn system_stream_delivers_android_and_simulator_entries_incrementally() { - let (_temporary, tool) = fake_log_tool(); - let android = LogService::new(SystemExecutor, ".").with_tools(&tool, &tool); + let (_temporary_android, android_tool) = fake_log_tool(); + let android = LogService::new(SystemExecutor, ".").with_tools(&android_tool, &android_tool); let mut android_entries = Vec::new(); let outcome = android .stream( @@ -911,7 +911,9 @@ mod tests { assert_eq!(outcome.entries, 1); assert_eq!(android_entries[0].message, "android ready"); - let simulator = LogService::new(SystemExecutor, ".").with_tools(&tool, &tool); + let (_temporary_simulator, simulator_tool) = fake_log_tool(); + let simulator = + LogService::new(SystemExecutor, ".").with_tools(&simulator_tool, &simulator_tool); let mut simulator_entries = Vec::new(); let outcome = simulator .stream(