Merge rust-bitcoin/rust-miniscript#503: CI cleanup

8c4853800712fd56b3fc258f6a0da2ca88e68d83 Clean up DO_NO_STD usage (Tobin C. Harding)
cc32761d986a17520729118874eabd4baff36e20 Use 1.58.0 directly (Tobin C. Harding)
1a098ad69acf4fa92f60e5035c8fd6f8f9ca34f5 Fix spelling mistake it CI job (Tobin C. Harding)
57059025090ab06f7b011e31724d13503fd8ebe1 Remove DO_NO_STD from fuzz job (Tobin C. Harding)
8b8564943babd871b7852a064642c57536cc9cf2 Remove MSRV local variable (Tobin C. Harding)
2edc456b262959ccc3273455e70eda8a022f7b72 Remove --all flag (Tobin C. Harding)
1a092483662ce470e6b53a2a148137bdff3d3cd7 Remove flags from shebang line (Tobin C. Harding)

Pull request description:

  Do a bunch of cleanups to the CI script and GitHub Actions config file. None of these changes change the amount of test coverage but we do achieve some de-duplication of test runs. Otherwise, clean up only.

ACKs for top commit:
  apoelstra:
    ACK 8c4853800712fd56b3fc258f6a0da2ca88e68d83

Tree-SHA512: bd0e1f81a5c39a8c79d789fc42235014cd4f69af612c6b49f549a826ff4b5d93fd09b9ea1a49229ca0bcff50d940d2d97d6eab43f3280fbb4b17bd2d836fdd9f

Author: heap-coder

.github/workflows/rust.yml

@@ -6,25 +6,20 @@ jobs:
   Fuzz:
     name: Fuzz
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust:
-          - 1.58.0
     steps:
       - name: Checkout Crate
         uses: actions/checkout@v2
-      - name: Install hongfuzz dependancies
+      - name: Install hongfuzz dependencies
         run: sudo apt update && sudo apt install build-essential binutils-dev libunwind-dev libblocksruntime-dev liblzma-dev
       - name: Checkout Toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.rust }}
+          toolchain: 1.58.0
           override: true
       - name: Running fuzzer
         env:
           DO_FUZZ: true
-          DO_NO_STD: true
         run: ./contrib/test.sh
 
   Nightly:
@@ -42,7 +37,6 @@ jobs:
       - name: Running benchmarks
         env:
           DO_BENCH: true
-          DO_NO_STD: true
         run: ./contrib/test.sh
       - name: Building docs
         env:
@@ -64,7 +58,6 @@ jobs:
           - rust: nightly
           - rust: 1.41.1
           - rust: 1.47
-            DO_NO_STD: true
     steps:
       - name: Checkout Crate
         uses: actions/checkout@v2
@@ -77,7 +70,7 @@ jobs:
       - name: Running cargo
         env:
           DO_FEATURE_MATRIX: true
-          DO_NO_STD: ${{ matrix.DO_NO_STD }}
+          DO_NO_STD: true
         run: ./contrib/test.sh
 
   Embedded:

contrib/test.sh

@@ -1,6 +1,6 @@
-#!/bin/sh -ex
+#!/bin/sh
 
-set -e
+set -ex
 
 FEATURES="compiler serde rand"
 
@@ -10,28 +10,23 @@ cargo update -p serde_derive --precise 1.0.142
 cargo --version
 rustc --version
 
-# Work out if we are using a nightly toolchain.
-MSRV=false
+# Pin dependencies required to build with Rust 1.41.1
 if cargo --version | grep "1\.41\.0"; then
-    MSRV=true
-fi
-
-if cargo --version | grep "1\.47\.0"; then
+    cargo update -p url --precise 2.2.2
+    cargo update -p form_urlencoded --precise 1.0.1
     cargo update -p once_cell --precise 1.13.1
 fi
 
-# form_urlencoded 1.1.0 breaks MSRV.
-if [ "$MSRV" = true ]; then
-    cargo update -p url --precise 2.2.2
-    cargo update -p form_urlencoded --precise 1.0.1
+# Pin dependencies required to build with Rust 1.47.0
+if cargo --version | grep "1\.47\.0"; then
     cargo update -p once_cell --precise 1.13.1
 fi
 
 # Format if told to
 if [ "$DO_FMT" = true ]
 then
     rustup component add rustfmt
-    cargo fmt --all -- --check
+    cargo fmt -- --check
 fi
 
 # Fuzz if told to
@@ -97,7 +92,7 @@ fi
 
 # Build the docs if told to (this only works with the nightly toolchain)
 if [ "$DO_DOCS" = true ]; then
-    RUSTDOCFLAGS="--cfg docsrs" cargo doc --all --features="$FEATURES"
+    RUSTDOCFLAGS="--cfg docsrs" cargo doc --features="$FEATURES"
 fi
 
 exit 0