Skip to content

Commit 4f17a05

Browse files
committed
Merge #18: Add -j1 to docs build invocation
9766b0d Add -j1 to docs build invocation (Tobin C. Harding) Pull request description: After upgrade of `hashes` but before we upgrade it in `secp` we get multiple versions in the dep tree. This makes the docs build choke because output directory uses the name of the crate (without the version) which then conflicts and causes the build to fail. Adding `-j1` so that only a single job is run when building the docs resolves the issue. ACKs for top commit: apoelstra: utACK 9766b0d Tree-SHA512: 8851f9d1ae7402577a1fa3b773c2caa8800adf214b94fd7140ec4599685377b7a5b1a222c34bdefbd812020c4896fafaa348b4fd20594c12ddc0191a14e588e3
2 parents 906ffd4 + 9766b0d commit 4f17a05

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ci/run_task.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,15 @@ do_dup_deps() {
273273
# below this checks that we feature guarded docs imports correctly.
274274
build_docs_with_nightly_toolchain() {
275275
need_nightly
276-
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" $cargo doc --all-features
276+
# -j1 is because docs build fails if multiple versions of `bitcoin_hashes` are present in dep tree.
277+
RUSTDOCFLAGS="--cfg docsrs -D warnings -D rustdoc::broken-intra-doc-links" $cargo doc --all-features -j1
277278
}
278279

279280
# Build the docs with a stable toolchain, in unison with the function
280281
# above this checks that we feature guarded docs imports correctly.
281282
build_docs_with_stable_toolchain() {
282283
local cargo="cargo +stable --locked" # Can't use global because of `+stable`.
283-
RUSTDOCFLAGS="-D warnings" $cargo doc --all-features
284+
RUSTDOCFLAGS="-D warnings" $cargo doc --all-features -j1
284285
}
285286

286287
# Bench only works with a non-stable toolchain (nightly, beta).

0 commit comments

Comments
 (0)