Skip to content

Commit

Permalink
Merge branch 'increase_msrv'
Browse files Browse the repository at this point in the history
  • Loading branch information
RCasatta committed Jun 14, 2023
2 parents 55cd231 + f4596d7 commit a761f33
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: ["1.41.1", "stable", "nightly"]
toolchain: ["1.48.0", "stable", "nightly"]

steps:
- uses: actions/checkout@v3
Expand All @@ -68,8 +68,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}
- run: cargo update -p which --precise 4.3.0
- run: cargo update -p tempfile --precise 3.3.0
- run: cargo update -p log --precise 0.4.18
- run: cargo update -p serde --precise 1.0.152
- run: cargo build

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Utility to run a regtest bitcoind process, useful in integration
license = "MIT"
repository = "https://github.com/RCasatta/bitcoind"
documentation = "https://docs.rs/bitcoind/"
rust-version = "1.41.1" # without features, with any feature is 1.57
rust-version = "1.48.0" # without features, with any feature is 1.57
edition = "2018"
categories = ["cryptography::cryptocurrencies", "development-tools::testing"]

Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,26 @@ RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features download,doc --open

## MSRV

The MSRV is 1.41.1 for version 0.29.* if no feature is used, otherwise is 1.57
The MSRV is 1.48.0 for version 0.29.* if no feature is used, otherwise is 1.57

Note: to respect 1.41.1 MSRV you need to use and older version of the which and tempfile dependencies,
Note: to respect 1.48.0 MSRV you need to use and older version of the which and tempfile dependencies,
like it's done in the CI:

```sh
cargo update -p which --precise 4.3.0
cargo update -p serde --precise 1.0.152
cargo update -p tempfile --precise 3.3.0
cargo update -p log --precise 0.4.18
```

Pinning in `Cargo.toml` is avoided because it could cause
compilation issues downstream.

## Nix

For reproducibility reasons, Nix build scripts cannot hit the internet, but the auto-download
feature does exactly that. To successfully build under Nix the user must provide the tarball locally
and specify its location via the `BITCOIND_TARBALL_FILE` env var.
For reproducibility reasons, Nix build scripts cannot hit the internet, but the
auto-download feature does exactly that. To successfully build under Nix the
user must provide the tarball locally and specify its location via the
`BITCOIND_TARBALL_FILE` env var.
Alternativily, use the dep without auto-download feature.

## Used by

Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.41.1"
msrv = "1.48.0"

0 comments on commit a761f33

Please sign in to comment.