Skip to content

Commit

Permalink
increase MSRV to 1.56.1
Browse files Browse the repository at this point in the history
  • Loading branch information
RCasatta committed Apr 2, 2024
1 parent c6d8bc5 commit da48b10
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 23 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: ["1.48.0", "stable", "nightly"]
toolchain: ["1.56.1", "stable", "nightly"]

steps:
- uses: actions/checkout@v3
Expand All @@ -81,15 +81,9 @@ jobs:
toolchain: ${{ matrix.toolchain }}
- run: |
cargo update
cargo update -p which --precise 4.2.5
cargo update -p tempfile --precise 3.3.0
cargo update -p log --precise 0.4.18
cargo update -p serde_json --precise 1.0.99
cargo update -p serde --precise 1.0.156
cargo update -p regex --precise 1.7.3
cargo update -p quote --precise 1.0.28
cargo update -p proc-macro2 --precise 1.0.63
if: ${{ matrix.toolchain == '1.48.0' }}
if: ${{ matrix.toolchain == '1.56.1' }}
- run: cargo build

build-nix:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "bitcoind"
version = "0.34.2"
version = "0.35.0"
authors = ["Riccardo Casatta <riccardo@casatta.it>"]
description = "Utility to run a regtest bitcoind process, useful in integration testing environment"
license = "MIT"
repository = "https://github.com/RCasatta/bitcoind"
documentation = "https://docs.rs/bitcoind/"
rust-version = "1.48.0" # without features, with any feature is 1.57
rust-version = "1.56.1"
edition = "2018"
categories = ["cryptography::cryptocurrencies", "development-tools::testing"]

Expand Down
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,15 @@ RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features download,doc --open

## MSRV

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

Note: to respect 1.48.0 MSRV you need to use and older version of some dependencies, in CI the below
Note: to respect 1.56.1 MSRV you need to use and older version of some dependencies, in CI the below
dependency versions are pinned:

```sh
cargo update
cargo update -p which --precise 4.2.5
cargo update -p tempfile --precise 3.3.0
cargo update -p log --precise 0.4.18
cargo update -p serde_json --precise 1.0.99
cargo update -p serde --precise 1.0.156
cargo update -p regex --precise 1.7.3
cargo update -p thiserror --precise 1.0.40
cargo update -p quote --precise 1.0.28
cargo update -p syn:2.0.37 --precise 2.0.32
cargo update -p proc-macro2 --precise 1.0.63
```

Pinning in `Cargo.toml` is avoided because it could cause
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.48.0"
msrv = "1.56.1"
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ impl BitcoinD {
);

let mut process = Command::new(exe.as_ref())
.args(&default_args)
.args(default_args)
.args(&p2p_args)
.args(&conf_args)
.args(&zmq_args)
Expand Down Expand Up @@ -608,7 +608,7 @@ mod test {
assert_eq!(peers_connected(&other_bitcoind.client), 1);
}

#[cfg(not(target_os = "windows"))]
#[cfg(not(target_os = "windows"))] // TODO: investigate why it doesn't work in windows
#[test]
fn test_data_persistence() {
// Create a Conf with staticdir type
Expand Down

0 comments on commit da48b10

Please sign in to comment.