Skip to content

Commit 362c3dc

Browse files
committed
Merge bitcoindevkit/bdk#1867: fix(ci): pin bzip2-sys to 0.1.12
23626fe ci(coverage): use `--ignore-errors unmapped` in genhtml (valued mammal) cd7e358 fix(ci): pin `bzip2-sys` to `0.1.12` (Leonardo Lima) Pull request description: <!-- You can erase any parts of this template not applicable to your Pull Request. --> ### Description It looks like CI is failing due to the latest release of https://github.com/trifectatechfoundation/bzip2-rs/releases/tag/v0.5.2 which is a dependency of zip and therefore from electrsd. It's failing on MSRV 1.63.0 step raising the following error: `error[E0658]: use of unstable library feature 'core_ffi_c'`. This PR adds bzip2-sys to the pinned dependency list, pinning it to `0.1.12`. <!-- Describe the purpose of this PR, what's being adding and/or fixed --> ### Notes to the reviewers <!-- In this section you can include notes directed to the reviewers, like explaining why some parts of the PR were done in a specific way --> ### Changelog notice - Adds `bzip2-sys` to the pinned dependency list, pinning it to `0.1.12`. <!-- Notice the release manager should include in the release tag message changelog --> <!-- See https://keepachangelog.com/en/1.0.0/ for examples --> ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: LagginTimes: ACK 23626fe Tree-SHA512: bd84cd106818641775996bfa02b5c5b802dc2ccb73f0f44b14a021730536c6de90811e7840ea562f877d35d257411cac8ad6c299ed88d6963f37d082918e4c72
2 parents b26ff89 + 23626fe commit 362c3dc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/code_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Run grcov
3737
run: grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --keep-only '**/crates/**' --ignore '**/tests/**' --ignore '**/examples/**' -o ./coverage/lcov.info
3838
- name: Generate HTML coverage report
39-
run: genhtml -o coverage-report.html --ignore-errors source ./coverage/lcov.info
39+
run: genhtml -o coverage-report.html --ignore-errors unmapped ./coverage/lcov.info
4040
- name: Coveralls upload
4141
uses: coverallsapp/github-action@master
4242
with:

ci/pin-msrv.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ cargo update -p security-framework-sys --precise "2.11.1"
2222
cargo update -p csv --precise "1.3.0"
2323
cargo update -p unicode-width --precise "0.1.13"
2424
cargo update -p native-tls --precise "0.2.13"
25-
cargo update -p flate2 --precise "1.0.35"
25+
cargo update -p flate2 --precise "1.0.35"
26+
cargo update -p bzip2-sys --precise "0.1.12"

0 commit comments

Comments
 (0)