Skip to content

Commit 2f2f138

Browse files
committed
Merge #1182: chore: fix MSRV for flate2
95250fc ci(chain): downgrade hashbrown dependency to 0.9.1 to fix ahash related MSRV issue (Steve Myers) f17df1e ci: more fixed dependencies for MSRV 1.57.0 (Vladimir Fomene) Pull request description: ACKs for top commit: notmandatory: ACK 95250fc realeinherjar: ACK 95250fc evanlinjin: ACK 95250fc Tree-SHA512: ad090713d97cf778598bb4acee200d7acbc987fe74964f171cc9939149251bddce9474b750371df26d3f6548780f4db2c17b3fe2cf5f6d627c808d682c929918
2 parents 3569acc + 95250fc commit 2f2f138

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

.github/workflows/cont_integration.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,23 @@ jobs:
3232
run: |
3333
cargo update -p log --precise "0.4.18"
3434
cargo update -p tempfile --precise "3.6.0"
35-
cargo update -p rustls:0.21.7 --precise "0.21.1"
35+
cargo update -p rustls:0.21.8 --precise "0.21.1"
3636
cargo update -p rustls:0.20.9 --precise "0.20.8"
37-
cargo update -p tokio:1.33.0 --precise "1.29.1"
37+
cargo update -p tokio --precise "1.29.1"
3838
cargo update -p tokio-util --precise "0.7.8"
39-
cargo update -p flate2:1.0.27 --precise "1.0.26"
39+
cargo update -p flate2 --precise "1.0.26"
4040
cargo update -p reqwest --precise "0.11.18"
4141
cargo update -p h2 --precise "0.3.20"
4242
cargo update -p rustls-webpki:0.100.3 --precise "0.100.1"
43-
cargo update -p rustls-webpki:0.101.6 --precise "0.101.1"
44-
cargo update -p zip:0.6.6 --precise "0.6.2"
43+
cargo update -p rustls-webpki:0.101.7 --precise "0.101.1"
44+
cargo update -p zip --precise "0.6.2"
4545
cargo update -p time --precise "0.3.13"
46-
cargo update -p cc --precise "1.0.81"
4746
cargo update -p byteorder --precise "1.4.3"
4847
cargo update -p webpki --precise "0.22.2"
4948
cargo update -p jobserver --precise "0.1.26"
49+
cargo update -p os_str_bytes --precise 6.5.1
50+
cargo update -p sct --precise 0.7.0
51+
cargo update -p cc --precise "1.0.81"
5052
- name: Build
5153
run: cargo build ${{ matrix.features }}
5254
- name: Test

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,35 +70,39 @@ cargo update -p log --precise "0.4.18"
7070
# tempfile 3.7.0 has MSRV 1.63.0+
7171
cargo update -p tempfile --precise "3.6.0"
7272
# rustls 0.21.7 has MSRV 1.60.0+
73-
cargo update -p rustls:0.21.7 --precise "0.21.1"
73+
cargo update -p rustls:0.21.8 --precise "0.21.1"
7474
# rustls 0.20.9 has MSRV 1.60.0+
7575
cargo update -p rustls:0.20.9 --precise "0.20.8"
7676
# tokio 1.33 has MSRV 1.63.0+
77-
cargo update -p tokio:1.33.0 --precise "1.29.1"
77+
cargo update -p tokio --precise "1.29.1"
7878
# tokio-util 0.7.9 doesn't build with MSRV 1.57.0
7979
cargo update -p tokio-util --precise "0.7.8"
8080
# flate2 1.0.27 has MSRV 1.63.0+
81-
cargo update -p flate2:1.0.27 --precise "1.0.26"
81+
cargo update -p flate2 --precise "1.0.26"
8282
# reqwest 0.11.19 has MSRV 1.63.0+
8383
cargo update -p reqwest --precise "0.11.18"
8484
# h2 0.3.21 has MSRV 1.63.0+
8585
cargo update -p h2 --precise "0.3.20"
8686
# rustls-webpki 0.100.3 has MSRV 1.60.0+
8787
cargo update -p rustls-webpki:0.100.3 --precise "0.100.1"
8888
# rustls-webpki 0.101.2 has MSRV 1.60.0+
89-
cargo update -p rustls-webpki:0.101.6 --precise "0.101.1"
89+
cargo update -p rustls-webpki:0.101.7 --precise "0.101.1"
9090
# zip 0.6.6 has MSRV 1.59.0+
91-
cargo update -p zip:0.6.6 --precise "0.6.2"
91+
cargo update -p zip --precise "0.6.2"
9292
# time 0.3.14 has MSRV 1.59.0+
9393
cargo update -p time --precise "0.3.13"
94-
# cc 1.0.82 has MSRV 1.61.0+
95-
cargo update -p cc --precise "1.0.81"
9694
# byteorder 1.5.0 has MSRV 1.60.0+
9795
cargo update -p byteorder --precise "1.4.3"
9896
# webpki 0.22.4 requires `ring:0.17.2` which has MSRV 1.61.0+
9997
cargo update -p webpki --precise "0.22.2"
10098
# jobserver 0.1.27 has MSRV 1.66.0+
10199
cargo update -p jobserver --precise "0.1.26"
100+
# os_str_bytes 6.6.0 has MSRV 1.61.0+
101+
cargo update -p os_str_bytes --precise 6.5.1
102+
# sct 0.7.1 has MSRV 1.61.0+
103+
cargo update -p sct --precise 0.7.0
104+
# cc 1.0.82 has MSRV 1.61.0+
105+
cargo update -p cc --precise "1.0.81"
102106
```
103107

104108
## License

crates/chain/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ bitcoin = { version = "0.30.0", default-features = false }
1818
serde_crate = { package = "serde", version = "1", optional = true, features = ["derive"] }
1919

2020
# Use hashbrown as a feature flag to have HashSet and HashMap from it.
21-
# note version 0.13 breaks outs MSRV.
22-
hashbrown = { version = "0.11", optional = true, features = ["serde"] }
21+
# note versions > 0.9.1 breaks ours 1.57.0 MSRV.
22+
hashbrown = { version = "0.9.1", optional = true, features = ["serde"] }
2323
miniscript = { version = "10.0.0", optional = true, default-features = false }
2424

2525
[dev-dependencies]

0 commit comments

Comments
 (0)