Skip to content

Commit 1f7f575

Browse files
committed
Merge #562: Pin serde_json
6f54ed9 Pin serde_json (Tobin C. Harding) Pull request description: Pin `serde_json` for 1.41 and 1.47 CI runs. Remove the pinning docs from the README and instead point devs to the CI script. (The docs are stale currently and are an unnecessary maintenance burden.) ACKs for top commit: apoelstra: ACK 6f54ed9 Tree-SHA512: e53eb13a64050c2f3166ba6481cbb84767b0308739cb1cc55b1f38bbb170d051223c7ee8083819a68714d17361b7a22ae1db05d693b80fdc249b13f7488cd613
2 parents a3327ba + 6f54ed9 commit 1f7f575

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,7 @@ This library should always compile with any combination of features (minus
4444
`no-std`) on **Rust 1.41.1** or **Rust 1.47** with `no-std`.
4545

4646
Some dependencies do not play nicely with our MSRV, if you are running the tests
47-
you may need to pin as follows:
48-
49-
```
50-
cargo update --package url --precise 2.2.2
51-
cargo update --package form_urlencoded --precise 1.0.1
52-
cargo update -p once_cell --precise 1.13.1
53-
cargo update -p bzip2 --precise 0.4.2
54-
```
47+
you may need to pin some dependencies. See `./contrib/test.sh` for current pinning.
5548

5649
## Contributing
5750

contrib/test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ fi
1717
# Pin dependencies required to build with Rust 1.41.1
1818
if cargo --version | grep "1\.41\.0"; then
1919
cargo update -p once_cell --precise 1.13.1
20+
cargo update -p serde_json --precise 1.0.99
2021
cargo update -p serde --precise 1.0.156
2122
fi
2223

2324
# Pin dependencies required to build with Rust 1.47.0
2425
if cargo --version | grep "1\.47\.0"; then
2526
cargo update -p once_cell --precise 1.13.1
27+
cargo update -p serde_json --precise 1.0.99
2628
cargo update -p serde --precise 1.0.156
2729
fi
2830

0 commit comments

Comments
 (0)