Skip to content

Commit 995dd09

Browse files
committed
Merge rust-bitcoin/rust-bitcoin#964: Remove 1.29 checks from CI pipeline
8f45723 test.sh: Remove 1.29 pinning (Tobin C. Harding) 15bae28 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: ACK 8f45723. Kixunil: ACK 8f45723 Tree-SHA512: acad2aa75077fd6959b85758aaa2265ae1f9c72a92edb528072cac68e83b903fcd2d15c9410ba35570132d927cf3d0bbc2deb537ba2298958476b0b8e5f2e149
2 parents 7700f65 + bfdb58a commit 995dd09

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ jobs:
2525
AS_DEPENDENCY: true
2626
DO_NO_STD: true
2727
DO_DOCS: true
28-
- rust: 1.29.0
28+
- rust: 1.41.1
2929
env:
3030
AS_DEPENDENCY: true
31-
PIN_VERSIONS: true
3231
steps:
3332
- name: Checkout Crate
3433
uses: actions/checkout@v2

contrib/test.sh

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,6 @@ then
88
alias cargo="cargo +$TOOLCHAIN"
99
fi
1010

11-
pin_common_verions() {
12-
cargo generate-lockfile --verbose
13-
cargo update -p cc --precise "1.0.41" --verbose
14-
cargo update -p serde --precise "1.0.98" --verbose
15-
cargo update -p serde_derive --precise "1.0.98" --verbose
16-
}
17-
18-
# Pin `cc` for Rust 1.29
19-
if [ "$PIN_VERSIONS" = true ]; then
20-
pin_common_verions
21-
cargo update -p byteorder --precise "1.3.4"
22-
fi
23-
2411
if [ "$DO_COV" = true ]
2512
then
2613
export RUSTFLAGS="-C link-dead-code"
@@ -95,10 +82,5 @@ then
9582
cd dep_test
9683
echo 'bitcoin = { path = "..", features = ["use-serde"] }' >> Cargo.toml
9784

98-
# Pin `cc` for Rust 1.29
99-
if [ -n "$PIN_VERSIONS" ]; then
100-
pin_common_verions
101-
fi
102-
10385
cargo test --verbose
10486
fi

0 commit comments

Comments
 (0)