Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

increase MSRV to 1.56.1 #155

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <[email protected]>"]
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"
3 changes: 2 additions & 1 deletion 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,6 +608,7 @@ mod test {
assert_eq!(peers_connected(&other_bitcoind.client), 1);
}

#[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
Loading