Merge rust-bitcoin/rust-bitcoin#964: Remove 1.29 checks from CI pipeline
8f45723bc6
test.sh: Remove 1.29 pinning (Tobin C. Harding)15bae28b6b
Remove CI check for Rust 1.29 (Tobin C. Harding) Pull request description: We no longer need to test against Rust 1.29 now that v0.28 is out. In order to allow minor changes to be merged (i.e., not the _big_ MSRV patchset) that rely on MSRV being 1.41.1 update the CI pipeline. Remove the pinning stuff from `contrib/test.sh` while we are at it. ACKs for top commit: sanket1729: ACK8f45723bc6
. Kixunil: ACK8f45723bc6
Tree-SHA512: acad2aa75077fd6959b85758aaa2265ae1f9c72a92edb528072cac68e83b903fcd2d15c9410ba35570132d927cf3d0bbc2deb537ba2298958476b0b8e5f2e149
This commit is contained in:
commit
d6f5d9885b
|
@ -25,10 +25,9 @@ jobs:
|
||||||
AS_DEPENDENCY: true
|
AS_DEPENDENCY: true
|
||||||
DO_NO_STD: true
|
DO_NO_STD: true
|
||||||
DO_DOCS: true
|
DO_DOCS: true
|
||||||
- rust: 1.29.0
|
- rust: 1.41.1
|
||||||
env:
|
env:
|
||||||
AS_DEPENDENCY: true
|
AS_DEPENDENCY: true
|
||||||
PIN_VERSIONS: true
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Crate
|
- name: Checkout Crate
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
|
@ -8,19 +8,6 @@ then
|
||||||
alias cargo="cargo +$TOOLCHAIN"
|
alias cargo="cargo +$TOOLCHAIN"
|
||||||
fi
|
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 ]
|
if [ "$DO_COV" = true ]
|
||||||
then
|
then
|
||||||
export RUSTFLAGS="-C link-dead-code"
|
export RUSTFLAGS="-C link-dead-code"
|
||||||
|
@ -95,10 +82,5 @@ then
|
||||||
cd dep_test
|
cd dep_test
|
||||||
echo 'bitcoin = { path = "..", features = ["use-serde"] }' >> Cargo.toml
|
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
|
cargo test --verbose
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue