Skip to content

Commit

Permalink
Merge #312: Bump MSRV to 1.48
Browse files Browse the repository at this point in the history
7053c8f Update MSRV to Rust 1.48.0 (Tobin C. Harding)

Pull request description:

  This would allow us to upgrade the `jsonrpc` dep and get `minreq` support possibly alleviating the need for #276. Also required to use the latest `rust-bitcoin`.

ACKs for top commit:
  RCasatta:
    utACK 7053c8f

Tree-SHA512: f3e25dfc2e61cab4666ab0be47406282fbdaabe614d98715377a16ff472d89f5678fb1a29613ca43cf9b671194b21af2b69c15d52ccd7dc26c0b8ac573b898a5
  • Loading branch information
RCasatta committed Nov 1, 2023
2 parents 7bd815f + 7053c8f commit b4f4576
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- rust: nightly
env:
RUSTFMTCHK: false
- rust: 1.41.1
- rust: 1.48.0
env:
RUSTFMTCHK: false
steps:
Expand All @@ -27,7 +27,6 @@ jobs:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo update -p serde --precise 1.0.152
- name: Running test script
env: ${{ matrix.env }}
run: ./contrib/test.sh
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased

- MSRV changed from 1.41.1 to 1.48.0

# 0.17.0

- add `list_wallet_dir` rpc
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ The following versions are officially supported and automatically tested:
* 0.21.0

# Minimum Supported Rust Version (MSRV)
This library should always compile with any combination of features on **Rust 1.41.1**.
This library should always compile with any combination of features on **Rust 1.48.0**.
11 changes: 11 additions & 0 deletions contrib/test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

set -xe

MSRV="1\.48"

# Just echo all the relevant env vars to help debug Travis.
echo "RUSTFMTCHECK: \"$RUSTFMTCHECK\""
echo "BITCOINVERSION: \"$BITCOINVERSION\""
Expand All @@ -11,6 +13,15 @@ if [ -n "$RUSTFMTCHECK" ]; then
cargo fmt --all -- --check
fi

# Test pinned versions (these are from rust-bitcoin pinning for 1.48).
if cargo --version | grep ${MSRV}; then
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 quote --precise 1.0.30
cargo update -p proc-macro2 --precise 1.0.63
fi

# Integration test.
if [ -n "$BITCOINVERSION" ]; then
wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
Expand Down

0 comments on commit b4f4576

Please sign in to comment.