From 3b388927cf843ab666745c08576ccb3df5fffa35 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Sun, 9 Feb 2025 10:16:09 -0600 Subject: [PATCH] ci: fix pinned rustls and add ci/pin-msrv.sh --- .github/workflows/cont_integration.yml | 18 ++---------------- README.md | 14 +------------- ci/pin-msrv.sh | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 29 deletions(-) create mode 100755 ci/pin-msrv.sh diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 6f4aaf38..c6d54d52 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -57,16 +57,7 @@ jobs: components: clippy - name: Pin dependencies for MSRV if: matrix.rust.version == '1.63.0' - run: | - cargo update -p tokio --precise "1.38.1" - cargo update -p tokio-util --precise "0.7.11" - cargo update -p home --precise "0.5.5" - cargo update -p regex --precise "1.7.3" - cargo update -p security-framework-sys --precise "2.11.1" - cargo update -p url --precise "2.5.0" - cargo update -p rustls@0.23.23 --precise "0.23.19" - cargo update -p hashbrown@0.15.2 --precise "0.15.0" - cargo update -p ureq --precise "2.10.1" + run: ./ci/pin-msrv.sh - name: Build run: cargo build --features bitcoin/std,miniscript/std,${{ matrix.features }} --no-default-features - name: Clippy @@ -204,11 +195,6 @@ jobs: toolchain: ${{ matrix.rust.version }} - name: Pin dependencies for MSRV if: matrix.rust.version == '1.63.0' - run: | - cargo update -p tokio --precise "1.38.1" - cargo update -p tokio-util --precise "0.7.11" - cargo update -p home --precise "0.5.5" - cargo update -p regex --precise "1.7.3" - cargo update -p security-framework-sys --precise "2.11.1" + run: ./ci/pin-msrv.sh - name: Test run: cargo test --features test-hardware-signer diff --git a/README.md b/README.md index 11890820..05c3dd02 100644 --- a/README.md +++ b/README.md @@ -212,16 +212,4 @@ dual licensed as above, without any additional terms or conditions. This library should compile with any combination of features with Rust 1.63.0. -To build with the MSRV you will need to pin dependencies as follows: - -```shell -cargo update -p tokio --precise "1.38.1" -cargo update -p tokio-util --precise "0.7.11" -cargo update -p home --precise "0.5.5" -cargo update -p regex --precise "1.7.3" -cargo update -p security-framework-sys --precise "2.11.1" -cargo update -p url --precise "2.5.0" -cargo update -p rustls@0.23.23 --precise "0.23.19" -cargo update -p hashbrown@0.15.2 --precise "0.15.0" -cargo update -p ureq --precise "2.10.1" -``` +To build with the MSRV of 1.63.0 you will need to pin dependencies by running the [`pin-msrv.sh`](./ci/pin-msrv.sh) script. diff --git a/ci/pin-msrv.sh b/ci/pin-msrv.sh new file mode 100755 index 00000000..4e93d7e9 --- /dev/null +++ b/ci/pin-msrv.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -x +set -euo pipefail + +# Pin dependencies for MSRV + +# To pin deps, switch toolchain to MSRV and execute the below updates + +# cargo clean +# rustup override set 1.63.0 +cargo update -p tokio --precise "1.38.1" +cargo update -p tokio-util --precise "0.7.11" +cargo update -p home --precise "0.5.5" +cargo update -p regex --precise "1.7.3" +cargo update -p security-framework-sys --precise "2.11.1" +cargo update -p url --precise "2.5.0" +cargo update -p rustls@0.23.23 --precise "0.23.19" +cargo update -p hashbrown@0.15.2 --precise "0.15.0" +cargo update -p ureq --precise "2.10.1" \ No newline at end of file -- 2.49.0