From 362313da2296f6b04c97c6a97f1a7f31165a8bde Mon Sep 17 00:00:00 2001 From: Einar Rasmussen Date: Sun, 1 Nov 2026 10:41:38 -0600 Subject: [PATCH 1/3] ci: pin the docs build to the installed nightly The book job installs nightly-2026-07-14 but build-cargo-docs.sh ran `cargo +nightly`, which resolves to the newest nightly channel. The 2026-11-01 nightly fails to compile boa_engine with an async-drop query cycle (rust-lang/rust#165263), so the script now reads the toolchain from RUST_NIGHTLY and the job sets it to the nightly it already installs. Adapted from upstream, which pins its newer workflows to nightly-2026-10-31; this release line's lint jobs are already pinned to nightly-2026-07-14. (cherry picked from commit 121b0f73dc5528e0ee78c375793df79af542c725) Co-Authored-By: Claude Fable 5.1 (cherry picked from commit 831e5742bf0e86434baaa80bdf8251b96ce6279e) --- .github/workflows/book.yml | 5 ++++- docs/vocs/scripts/build-cargo-docs.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml index 86a39c9945b..7f71b63d156 100644 --- a/.github/workflows/book.yml +++ b/.github/workflows/book.yml @@ -18,6 +18,9 @@ jobs: permissions: contents: read timeout-minutes: 90 + env: + # Read by build-cargo-docs.sh, which `bun run build` also invokes. + RUST_NIGHTLY: nightly-2026-07-14 steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -41,7 +44,7 @@ jobs: - name: Install Rust nightly uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2026-07-14 + toolchain: ${{ env.RUST_NIGHTLY }} - name: Build docs run: cd docs/vocs && bash scripts/build-cargo-docs.sh diff --git a/docs/vocs/scripts/build-cargo-docs.sh b/docs/vocs/scripts/build-cargo-docs.sh index 634f4acf77b..e03c324e779 100755 --- a/docs/vocs/scripts/build-cargo-docs.sh +++ b/docs/vocs/scripts/build-cargo-docs.sh @@ -10,6 +10,6 @@ echo "Building cargo docs..." # Build the documentation export RUSTDOCFLAGS="--cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page -Zunstable-options" -cargo +nightly docs --exclude "example-*" +cargo +"${RUST_NIGHTLY:-nightly}" docs --exclude "example-*" echo "Cargo docs built successfully at ./target/doc" From 32716afc054f2d0034d25f924dd10884a85545f8 Mon Sep 17 00:00:00 2001 From: Einar Rasmussen Date: Sun, 1 Nov 2026 10:14:29 -0600 Subject: [PATCH 2/3] deps: update patched transitive dependencies Lockfile-only patch updates that resolve the inherited advisories with compatible releases: libz-sys 1.1.31, rustls-webpki 0.103.16, tokio 1.53.3, webpki-root-certs 1.0.10, webpki-roots 1.0.10 and zstd-sys 2.1.2. No manifest changes. Co-Authored-By: Claude Fable 5.1 (cherry picked from commit 199dfea43f1108aaf8c51f01c06594bad84ec0ce) --- Cargo.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0af8e7f9822..dcd132cab81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1035,7 +1035,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1046,7 +1046,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -2471,7 +2471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3011,7 +3011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 2.0.118", + "syn 1.0.109", ] [[package]] @@ -3496,7 +3496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5239,7 +5239,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -5853,9 +5853,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.28" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3a226e576f50782b3305c5ccf458698f92798987f551c6a02efe8276721e22" +checksum = "ff20308ecabd635a2dc1dd5834a86c462cca20efba1d5d3ddab1f8aea3455cb2" dependencies = [ "cc", "libc", @@ -6369,7 +6369,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -11555,7 +11555,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -11614,7 +11614,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -11634,8 +11634,8 @@ dependencies = [ "rustls-webpki", "security-framework", "security-framework-sys", - "webpki-root-certs 1.0.7", - "windows-sys 0.59.0", + "webpki-root-certs 1.0.10", + "windows-sys 0.52.0", ] [[package]] @@ -11646,9 +11646,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "aws-lc-rs", "ring", @@ -12269,7 +12269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -12528,7 +12528,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -12795,9 +12795,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.53.1" +version = "1.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "ce3335fa71841cda333a58d7615b03901380ecf09d59b3296d21f8bbac0dde4e" dependencies = [ "bytes", "libc", @@ -13724,14 +13724,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e" dependencies = [ - "webpki-root-certs 1.0.7", + "webpki-root-certs 1.0.10", ] [[package]] name = "webpki-root-certs" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +checksum = "58ec80e73fd8baf57bf0d9615554c75348bda990d6d5bbeab964dd068319fecb" dependencies = [ "rustls-pki-types", ] @@ -13742,14 +13742,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.7", + "webpki-roots 1.0.10", ] [[package]] name = "webpki-roots" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" dependencies = [ "rustls-pki-types", ] @@ -13792,7 +13792,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -14500,9 +14500,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" +version = "2.1.2+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3" dependencies = [ "cc", "pkg-config", From 160865e87a1e932b59d1a8ca4961d62cbeb01f67 Mon Sep 17 00:00:00 2001 From: Einar Rasmussen Date: Sun, 1 Nov 2026 10:14:29 -0600 Subject: [PATCH 3/3] deps: ignore compression advisories pinned by reth-core 0.7 zstd 0.13 and zstd-safe 7 are fixed by reth-zstd-compressors 0.7; the patched releases need reth-core 0.8 and Rust 1.96. crypto-bigint 0.5 has no patched release compatible with elliptic-curve 0.13. Both are documented ignores so the fork's cargo-deny gate reflects what op-v2.6.0 can actually fix. Co-Authored-By: Claude Fable 5.1 (cherry picked from commit 470cfb96b3c8eae586dadc7bf2e37f4d850d1fda) --- deny.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deny.toml b/deny.toml index be45b22db44..cf907cb3124 100644 --- a/deny.toml +++ b/deny.toml @@ -12,6 +12,13 @@ ignore = [ "RUSTSEC-2023-0089", # https://rustsec.org/advisories/RUSTSEC-2026-0173 proc-macro-error2 is unmaintained "RUSTSEC-2026-0173", + # crypto-bigint 0.5 has no patched release compatible with elliptic-curve 0.13. + "RUSTSEC-2026-0387", + # zstd 0.13 comes from reth-zstd-compressors 0.7; the patched zstd 0.14.3 needs reth-core 0.8 and Rust 1.96. + "RUSTSEC-2026-0391", + # zstd-safe 7 comes from reth-zstd-compressors 0.7; the patched zstd-safe 8.2.0 needs reth-core 0.8 and Rust 1.96. + "RUSTSEC-2026-0398", + "RUSTSEC-2026-0403", ] # This section is considered when running `cargo deny check bans`.