From 4772ed8c9d90a5d6284f23acf03eb485aa5495bc Mon Sep 17 00:00:00 2001 From: DanGould Date: Sun, 28 Jul 2024 16:13:29 -0400 Subject: [PATCH 1/2] Pin tokio 1.38 for MSRV 1.63 --- .github/workflows/rust.yml | 1 + README.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f81c3f41..dd0cc50a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -32,6 +32,7 @@ jobs: cargo update -p which --precise 4.4.0 cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p reqwest --precise 0.12.4 + cargo update -p tokio --precise 1.38.1 - name: Run tests run: bash contrib/test.sh diff --git a/README.md b/README.md index 18ea3c3b..41d69867 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ cargo update -p regex --precise 1.9.6 cargo update -p url --precise 2.5.0 cargo update -p which --precise 4.4.0 cargo update -p reqwest --precise 0.12.4 +cargo update -p tokio --precise 1.38.1 ``` ### `payjoin-cli` @@ -100,6 +101,7 @@ cargo update -p url --precise 2.5.0 cargo update -p which --precise 4.4.0 cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p reqwest --precise 0.12.4 +cargo update -p tokio --precise 1.38.1 ``` ## Code Formatting From a4dbfc99a89be3e860910358be0250b6d1a7cc58 Mon Sep 17 00:00:00 2001 From: DanGould Date: Sun, 28 Jul 2024 16:12:36 -0400 Subject: [PATCH 2/2] Alphabetically order pinned deps --- .github/workflows/rust.yml | 6 +++--- README.md | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dd0cc50a..56b25b20 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -28,11 +28,11 @@ jobs: cargo update -p cc --precise 1.0.105 cargo update -p clap_lex --precise 0.3.0 cargo update -p regex --precise 1.9.6 - cargo update -p url --precise 2.5.0 - cargo update -p which --precise 4.4.0 - cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p reqwest --precise 0.12.4 + cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p tokio --precise 1.38.1 + cargo update -p url --precise 2.5.0 + cargo update -p which --precise 4.4.0 - name: Run tests run: bash contrib/test.sh diff --git a/README.md b/README.md index 41d69867..c15efec6 100644 --- a/README.md +++ b/README.md @@ -85,10 +85,10 @@ To build and test with the MSRV you will need to pin the below dependency versio ```shell cargo update -p cc --precise 1.0.105 cargo update -p regex --precise 1.9.6 -cargo update -p url --precise 2.5.0 -cargo update -p which --precise 4.4.0 cargo update -p reqwest --precise 0.12.4 +cargo update -p url --precise 2.5.0 cargo update -p tokio --precise 1.38.1 +cargo update -p which --precise 4.4.0 ``` ### `payjoin-cli` @@ -97,11 +97,11 @@ cargo update -p tokio --precise 1.38.1 cargo update -p cc --precise 1.0.105 cargo update -p clap_lex --precise 0.3.0 cargo update -p regex --precise 1.9.6 -cargo update -p url --precise 2.5.0 -cargo update -p which --precise 4.4.0 -cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p reqwest --precise 0.12.4 +cargo update -p time@0.3.36 --precise 0.3.20 cargo update -p tokio --precise 1.38.1 +cargo update -p url --precise 2.5.0 +cargo update -p which --precise 4.4.0 ``` ## Code Formatting