From 15bae28b6ba5e08a44b7826b68bc78a86be4121b Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 21 Apr 2022 11:37:47 +1000 Subject: [PATCH 1/3] Remove CI check for Rust 1.29 In preparation for starting to merge patches that rely on an MSRV of 1.41 update the CI pipeline. --- .github/workflows/rust.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d1e6b0cf8e..5135c9ca6c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,10 +25,9 @@ jobs: AS_DEPENDENCY: true DO_NO_STD: true DO_DOCS: true - - rust: 1.29.0 + - rust: 1.41.1 env: AS_DEPENDENCY: true - PIN_VERSIONS: true steps: - name: Checkout Crate uses: actions/checkout@v2 From 8f45723bc690ee68737311577dc8167add5ec940 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 21 Apr 2022 11:38:59 +1000 Subject: [PATCH 2/3] test.sh: Remove 1.29 pinning We no longer need to test Rust 1.29, remove the pinning from the test script. --- contrib/test.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/contrib/test.sh b/contrib/test.sh index 41503bc997..676e26bb86 100755 --- a/contrib/test.sh +++ b/contrib/test.sh @@ -8,19 +8,6 @@ then alias cargo="cargo +$TOOLCHAIN" fi -pin_common_verions() { - cargo generate-lockfile --verbose - cargo update -p cc --precise "1.0.41" --verbose - cargo update -p serde --precise "1.0.98" --verbose - cargo update -p serde_derive --precise "1.0.98" --verbose -} - -# Pin `cc` for Rust 1.29 -if [ "$PIN_VERSIONS" = true ]; then - pin_common_verions - cargo update -p byteorder --precise "1.3.4" -fi - if [ "$DO_COV" = true ] then export RUSTFLAGS="-C link-dead-code" @@ -95,10 +82,5 @@ then cd dep_test echo 'bitcoin = { path = "..", features = ["use-serde"] }' >> Cargo.toml - # Pin `cc` for Rust 1.29 - if [ -n "$PIN_VERSIONS" ]; then - pin_common_verions - fi - cargo test --verbose fi From 8e005f989502bfb00f53d51cfa9a3dc1193d3491 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Fri, 22 Apr 2022 09:58:40 +1000 Subject: [PATCH 3/3] Upgrade dev dependencies Now we no longer need to support Rust 1.29 we can use latest `serde` and remove the `ryu` dev dependency altogether. --- Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 25020b7111..eb35f2b263 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,12 +45,10 @@ serde = { version = "1", features = [ "derive" ], optional = true } hashbrown = { version = "0.8", optional = true } [dev-dependencies] -serde_json = "<1.0.45" +serde_json = "1" serde_test = "1" secp256k1 = { version = "0.22.0", features = [ "recovery", "rand-std" ] } bincode = "1.3.1" -# We need to pin ryu (transitive dep from serde_json) to stay compatible with Rust 1.22.0 -ryu = "<1.0.5" [[example]] name = "bip32"