From 73306a3503e1c266e26e401ceb53fa930cc0c990 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Fri, 10 Mar 2023 22:24:39 +0100 Subject: [PATCH] Pin tokio to 1.26 on windows to fix CI --- .github/workflows/build.yml | 5 +++++ lightning-block-sync/Cargo.toml | 2 +- lightning-net-tokio/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10f71bda0..100441d2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,6 +86,11 @@ jobs: run: cargo update -p tokio --precise "1.14.0" --verbose env: CARGO_NET_GIT_FETCH_WITH_CLI: "true" + - name: Pin tokio to 1.26 for Windows + if: "matrix.platform == 'windows-latest'" + run: cargo update -p tokio --precise "1.26.0" --verbose + env: + CARGO_NET_GIT_FETCH_WITH_CLI: "true" - name: Build on Rust ${{ matrix.toolchain }} with net-tokio if: "matrix.build-net-tokio && !matrix.coverage" run: cargo build --verbose --color always diff --git a/lightning-block-sync/Cargo.toml b/lightning-block-sync/Cargo.toml index 69c64a14f..894c3b528 100644 --- a/lightning-block-sync/Cargo.toml +++ b/lightning-block-sync/Cargo.toml @@ -28,4 +28,4 @@ chunked_transfer = { version = "1.4", optional = true } [dev-dependencies] lightning = { version = "0.0.114", path = "../lightning", features = ["_test_utils"] } -tokio = { version = "~1.14", features = [ "macros", "rt" ] } +tokio = { version = "1.14", features = [ "macros", "rt" ] } diff --git a/lightning-net-tokio/Cargo.toml b/lightning-net-tokio/Cargo.toml index 203fbc9b8..6250628d2 100644 --- a/lightning-net-tokio/Cargo.toml +++ b/lightning-net-tokio/Cargo.toml @@ -20,5 +20,5 @@ lightning = { version = "0.0.114", path = "../lightning" } tokio = { version = "1.0", features = [ "io-util", "macros", "rt", "sync", "net", "time" ] } [dev-dependencies] -tokio = { version = "~1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } +tokio = { version = "1.14", features = [ "io-util", "macros", "rt", "rt-multi-thread", "sync", "net", "time" ] } lightning = { version = "0.0.114", path = "../lightning", features = ["_test_utils"] } -- 2.39.5