Skip to content

Commit 558896b

Browse files
committed
Merge rust-bitcoin#4990: Fix CI: Update arbitrary and update lock files
19e830b CI: Use --locked when calling cargo public-api (Tobin C. Harding) e1d874d p2p: Update arbitrary dep to 1.4.1 (Tobin C. Harding) Pull request description: CI is currently broken on `master` because a series of recent `serde` updated changed the paths to parts of their API that appear in our API files. Fix this by using our recent lockfile in our check-API CI job. Also add a patch to fix `just update-lock-files`, which felt that the `arbitrary` dep in `p2p` was underspecified. (Description written by apoelstra) ACKs for top commit: apoelstra: ACK 19e830b; successfully ran local tests Tree-SHA512: 966b4f4c0b46a2b3894e12647b7bdae2770b54597644ff8b78b9b26716d461aa1e6860e86e2136e4f8de199b8a7bdb8caa1c7b93fb135015e737c759aa0a5e79
2 parents 741ef66 + 19e830b commit 558896b

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.github/workflows/rust.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ jobs:
311311
runs-on: ubuntu-24.04
312312
strategy:
313313
fail-fast: false
314+
matrix:
315+
dep: [recent]
314316
steps:
315317
- name: "Checkout repo"
316318
uses: actions/checkout@v5
@@ -320,6 +322,8 @@ jobs:
320322
toolchain: ${{ needs.Prepare.outputs.nightly_version }}
321323
- name: "Install cargo-public-api"
322324
run: cargo install --locked cargo-public-api --version 0.49.0
325+
- name: "Set dependencies"
326+
run: cp Cargo-${{ matrix.dep }}.lock Cargo.lock
323327
- name: "Run API checker script"
324328
run: ./contrib/check-for-api-changes.sh
325329

contrib/check-for-api-changes.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ check_for_changes() {
6565

6666
# Run cargo when --all-features is not used.
6767
run_cargo() {
68-
RUSTDOCFLAGS="$RUSTDOCFLAGS" cargo +"$NIGHTLY" public-api --simplified "$@"
68+
RUSTDOCFLAGS="$RUSTDOCFLAGS" cargo +"$NIGHTLY" --locked public-api --simplified "$@"
6969
}
7070

7171
# Run cargo with all features enabled.
7272
run_cargo_all_features() {
73-
cargo +"$NIGHTLY" public-api --simplified --all-features
73+
cargo +"$NIGHTLY" --locked public-api --simplified --all-features
7474
}
7575

7676
need_nightly() {

p2p/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internals = { package = "bitcoin-internals", path = "../internals", default-feat
2525
io = { package = "bitcoin-io", path = "../io", default-features = false }
2626
units = { package = "bitcoin-units", path = "../units", default-features = false }
2727

28-
arbitrary = { version = "1.4", optional = true }
28+
arbitrary = { version = "1.4.1", optional = true }
2929

3030
[dev-dependencies]
3131
hex_lit = "0.1.1"

0 commit comments

Comments
 (0)