From f17df1e1338c63cb79b5f9b2223dba347244c432 Mon Sep 17 00:00:00 2001 From: Vladimir Fomene Date: Fri, 13 Oct 2023 20:45:40 +0300 Subject: [PATCH 1/2] ci: more fixed dependencies for MSRV 1.57.0 --- .github/workflows/cont_integration.yml | 14 ++++++++------ README.md | 18 +++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 4d60f15b9..fe643210e 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -32,21 +32,23 @@ jobs: run: | cargo update -p log --precise "0.4.18" cargo update -p tempfile --precise "3.6.0" - cargo update -p rustls:0.21.7 --precise "0.21.1" + cargo update -p rustls:0.21.8 --precise "0.21.1" cargo update -p rustls:0.20.9 --precise "0.20.8" - cargo update -p tokio:1.33.0 --precise "1.29.1" + cargo update -p tokio --precise "1.29.1" cargo update -p tokio-util --precise "0.7.8" - cargo update -p flate2:1.0.27 --precise "1.0.26" + cargo update -p flate2 --precise "1.0.26" cargo update -p reqwest --precise "0.11.18" cargo update -p h2 --precise "0.3.20" cargo update -p rustls-webpki:0.100.3 --precise "0.100.1" - cargo update -p rustls-webpki:0.101.6 --precise "0.101.1" - cargo update -p zip:0.6.6 --precise "0.6.2" + cargo update -p rustls-webpki:0.101.7 --precise "0.101.1" + cargo update -p zip --precise "0.6.2" cargo update -p time --precise "0.3.13" - cargo update -p cc --precise "1.0.81" cargo update -p byteorder --precise "1.4.3" cargo update -p webpki --precise "0.22.2" cargo update -p jobserver --precise "0.1.26" + cargo update -p os_str_bytes --precise 6.5.1 + cargo update -p sct --precise 0.7.0 + cargo update -p cc --precise "1.0.81" - name: Build run: cargo build ${{ matrix.features }} - name: Test diff --git a/README.md b/README.md index 5e2cec6d5..80c86f282 100644 --- a/README.md +++ b/README.md @@ -70,15 +70,15 @@ cargo update -p log --precise "0.4.18" # tempfile 3.7.0 has MSRV 1.63.0+ cargo update -p tempfile --precise "3.6.0" # rustls 0.21.7 has MSRV 1.60.0+ -cargo update -p rustls:0.21.7 --precise "0.21.1" +cargo update -p rustls:0.21.8 --precise "0.21.1" # rustls 0.20.9 has MSRV 1.60.0+ cargo update -p rustls:0.20.9 --precise "0.20.8" # tokio 1.33 has MSRV 1.63.0+ -cargo update -p tokio:1.33.0 --precise "1.29.1" +cargo update -p tokio --precise "1.29.1" # tokio-util 0.7.9 doesn't build with MSRV 1.57.0 cargo update -p tokio-util --precise "0.7.8" # flate2 1.0.27 has MSRV 1.63.0+ -cargo update -p flate2:1.0.27 --precise "1.0.26" +cargo update -p flate2 --precise "1.0.26" # reqwest 0.11.19 has MSRV 1.63.0+ cargo update -p reqwest --precise "0.11.18" # h2 0.3.21 has MSRV 1.63.0+ @@ -86,19 +86,23 @@ cargo update -p h2 --precise "0.3.20" # rustls-webpki 0.100.3 has MSRV 1.60.0+ cargo update -p rustls-webpki:0.100.3 --precise "0.100.1" # rustls-webpki 0.101.2 has MSRV 1.60.0+ -cargo update -p rustls-webpki:0.101.6 --precise "0.101.1" +cargo update -p rustls-webpki:0.101.7 --precise "0.101.1" # zip 0.6.6 has MSRV 1.59.0+ -cargo update -p zip:0.6.6 --precise "0.6.2" +cargo update -p zip --precise "0.6.2" # time 0.3.14 has MSRV 1.59.0+ cargo update -p time --precise "0.3.13" -# cc 1.0.82 has MSRV 1.61.0+ -cargo update -p cc --precise "1.0.81" # byteorder 1.5.0 has MSRV 1.60.0+ cargo update -p byteorder --precise "1.4.3" # webpki 0.22.4 requires `ring:0.17.2` which has MSRV 1.61.0+ cargo update -p webpki --precise "0.22.2" # jobserver 0.1.27 has MSRV 1.66.0+ cargo update -p jobserver --precise "0.1.26" +# os_str_bytes 6.6.0 has MSRV 1.61.0+ +cargo update -p os_str_bytes --precise 6.5.1 +# sct 0.7.1 has MSRV 1.61.0+ +cargo update -p sct --precise 0.7.0 +# cc 1.0.82 has MSRV 1.61.0+ +cargo update -p cc --precise "1.0.81" ``` ## License From 95250fc44ed1372e77995d04ac2b380e0cb126a0 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Fri, 3 Nov 2023 21:46:25 -0500 Subject: [PATCH 2/2] ci(chain): downgrade hashbrown dependency to 0.9.1 to fix ahash related MSRV issue --- crates/chain/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml index 70748893a..7af7d3410 100644 --- a/crates/chain/Cargo.toml +++ b/crates/chain/Cargo.toml @@ -18,8 +18,8 @@ bitcoin = { version = "0.30.0", default-features = false } serde_crate = { package = "serde", version = "1", optional = true, features = ["derive"] } # Use hashbrown as a feature flag to have HashSet and HashMap from it. -# note version 0.13 breaks outs MSRV. -hashbrown = { version = "0.11", optional = true, features = ["serde"] } +# note versions > 0.9.1 breaks ours 1.57.0 MSRV. +hashbrown = { version = "0.9.1", optional = true, features = ["serde"] } miniscript = { version = "10.0.0", optional = true, default-features = false } [dev-dependencies]